vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-fstest.c (cmd_cmp): Compare directories recursively.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-03 16:45:40 +02:00
parent 1516bfb43a
commit dab797f476
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-03 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-fstest.c (cmd_cmp): Compare directories recursively.
2012-05-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/reiserfs.c (grub_reiserfs_iterate_dir): Put a trailing

48
util/grub-fstest.c
View file

@ -40,6 +40,12 @@
#include <string.h>
#include <stdlib.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "progname.h"
#include "argp.h"
@ -245,6 +251,48 @@ cmd_cmp (char *src, char *dest)
return 0;
}
struct stat st;
if (stat (dest, &st) == -1)
grub_util_error (_("OS file %s open error: %s"), dest,
strerror (errno));
if (S_ISDIR (st.st_mode))
{
DIR *dir = opendir (dest);
struct dirent *entry;
if (dir == NULL)
{
grub_util_error (_("OS file %s open error: %s"), dest,
strerror (errno));
return;
}
while ((entry = readdir (dir)))
{
char *srcnew, *destnew;
char *ptr;
if (strcmp (entry->d_name, ".") == 0
|| strcmp (entry->d_name, "..") == 0)
continue;
srcnew = xmalloc (strlen (src) + sizeof ("/")
+ strlen (entry->d_name));
destnew = xmalloc (strlen (dest) + sizeof ("/")
+ strlen (entry->d_name));
ptr = stpcpy (srcnew, src);
*ptr++ = '/';
strcpy (ptr, entry->d_name);
ptr = stpcpy (destnew, dest);
*ptr++ = '/';
strcpy (ptr, entry->d_name);
if (lstat (dest, &st) == -1 || S_ISLNK (st.st_mode))
continue;
cmd_cmp (srcnew, destnew);
}
closedir (dir);
return;
}
ff = fopen (dest, "rb");
if (ff == NULL)
{