--- embedtools/src/dircmp.c 2010/07/13 09:35:01 1.1.2.1
+++ embedtools/src/dircmp.c 2010/07/13 11:49:49 1.1.2.4
@@ -3,7 +3,7 @@
extern char compiled[], compiledby[], compilehost[];
-char l;
+char lm;
static void
@@ -11,8 +11,10 @@ Usage()
{
printf( "-= DirCmp =- Tool for compare directories and show differences\n"
"=== %s === %s@%s ===\n\n"
- " Syntax: dircmp [options]
\n\n"
- "\t-l\t\tLong directory output ..."
+ " Syntax: dircmp [options] []\n\n"
+ "\t-l\t\tLong directory output ...\n"
+ "\t-s\t\tCompare dir from stdin list\n"
+ "\t-o \tOutput diff to filename\n"
"\n", compiled, compiledby, compilehost);
}
@@ -71,7 +73,7 @@ cmpDir(const char *csDir1, const char *csDir2, struct
struct stat sb;
char szStr[MAX_STR], szType[MAX_STR];
- if (!csDir1 || !csDir2 || !list)
+ if (!csDir1 || !list)
return -1;
else
memset(tags, -1, sizeof tags);
@@ -85,7 +87,12 @@ cmpDir(const char *csDir1, const char *csDir2, struct
memset(l, 0, sizeof(struct tagDirName));
}
- dir = opendir(csDir1);
+ if (chdir(csDir1) == -1) {
+ printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno));
+ free(l);
+ return -1;
+ }
+ dir = opendir(".");
if (!dir) {
printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno));
free(l);
@@ -107,10 +114,10 @@ cmpDir(const char *csDir1, const char *csDir2, struct
l[n].tag = crcFletcher16((u_short*) d.d_name, d.d_namlen / 2 + d.d_namlen % 2);
l[n].hash = crcAdler((u_char*) d.d_name, d.d_namlen);
strlcpy(l[n].name, d.d_name, MAXPATHLEN);
- if (l) {
+ if (lm & 1) {
if (lstat(d.d_name, &sb) != -1) {
memset(szStr, 0, MAX_STR);
- strftime(szStr, MAX_STR, "%y-%m-%d %H:%M:%S", localtime(&sb.st_mtim));
+ strftime(szStr, MAX_STR, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
switch (d.d_type) {
case DT_FIFO:
strlcpy(szType, "fifo", MAX_STR);
@@ -141,8 +148,9 @@ cmpDir(const char *csDir1, const char *csDir2, struct
strlcpy(szType, "unknown", MAX_STR);
break;
}
- snprintf(l[n].extra, MAX_STR, "%s links=%d %d:%d perm=0%o size=%llu %s\n", szType,
- sb.st_nlink, sb.st_uid, sb.st_gid, sb.st_mode, sb.st_size, szStr);
+ snprintf(l[n].extra, MAX_STR, "%s links=%d inode=%u %d:%d perm=0%o size=%llu %s",
+ szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,
+ sb.st_mode & 0x1fff, sb.st_size, szStr);
}
}
@@ -153,8 +161,18 @@ cmpDir(const char *csDir1, const char *csDir2, struct
for (i = n - 1; i > -1; i--)
tags[l[i].tag] = i;
+ // if only 1 dir supplied and output filename is set, goto end
+ if (lm & 2 && !csDir2)
+ goto end;
+ ////
+
// open dir 2 for diff ...
- dir = opendir(csDir2);
+ if (chdir(csDir2) == -1) {
+ printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno));
+ free(l);
+ return -1;
+ }
+ dir = opendir(".");
if (!dir) {
printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno));
free(l);
@@ -194,6 +212,45 @@ cmpDir(const char *csDir1, const char *csDir2, struct
l[n].tag = t;
l[n].hash = hash;
strlcpy(l[n].name, d.d_name, MAXPATHLEN);
+ if (lm & 1) {
+ if (lstat(d.d_name, &sb) != -1) {
+ memset(szStr, 0, MAX_STR);
+ strftime(szStr, MAX_STR, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
+ switch (d.d_type) {
+ case DT_FIFO:
+ strlcpy(szType, "fifo", MAX_STR);
+ break;
+ case DT_CHR:
+ strlcpy(szType, "char", MAX_STR);
+ break;
+ case DT_DIR:
+ strlcpy(szType, "dir", MAX_STR);
+ break;
+ case DT_BLK:
+ strlcpy(szType, "block", MAX_STR);
+ break;
+ case DT_REG:
+ strlcpy(szType, "file", MAX_STR);
+ break;
+ case DT_LNK:
+ strlcpy(szType, "link", MAX_STR);
+ break;
+ case DT_SOCK:
+ strlcpy(szType, "socket", MAX_STR);
+ break;
+ case DT_WHT:
+ strlcpy(szType, "wht", MAX_STR);
+ break;
+ case DT_UNKNOWN:
+ default:
+ strlcpy(szType, "unknown", MAX_STR);
+ break;
+ }
+ snprintf(l[n].extra, MAX_STR, "%s links=%d inode=%u %d:%d perm=0%o size=%llu %s",
+ szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,
+ sb.st_mode & 0x1fff, sb.st_size, szStr);
+ }
+ }
n++;
}
@@ -208,7 +265,7 @@ cmpDir(const char *csDir1, const char *csDir2, struct
i--;
}
n -= cx;
-
+end:
*list = l;
return n;
}
@@ -218,15 +275,23 @@ cmpDir(const char *csDir1, const char *csDir2, struct
int
main(int argc, char **argv)
{
- u_char *md[2];
- char ch;
+ u_char *md[2] = { NULL, NULL };
+ char ch, szFName[MAXPATHLEN];
struct tagDirName *list;
register int i;
+ FILE *f = stdout;
- while ((ch = getopt(argc, argv, "hl")) != -1)
+ while ((ch = getopt(argc, argv, "hlo:s")) != -1)
switch (ch) {
+ case 'o':
+ lm |= 2;
+ strlcpy(szFName, optarg, MAXPATHLEN);
+ break;
+ case 's':
+ lm |= 4;
+ break;
case 'l':
- l = 1;
+ lm |= 1;
break;
case 'h':
default:
@@ -236,35 +301,50 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
- if (argc < 2) {
+ if (argc < 1 || (lm < 2 && argc < 2)) {
Usage();
return 127;
}
// check for general differences
if (calcDir(argv[0], &md[0]) == -1)
return 127;
- if (calcDir(argv[1], &md[1]) == -1) {
- free(md[0]);
- return 127;
+ if (argc > 1 && lm < 4) {
+ if (calcDir(argv[1], &md[1]) == -1) {
+ free(md[0]);
+ return 127;
+ }
+ if (!memcmp(md[0], md[1], MD5_DIGEST_LENGTH)) {
+ free(md[0]);
+ if (md[1])
+ free(md[1]);
+ printf("Directory %s == %s\n\n", argv[0], argv[1]);
+ return 0;
+ } else {
+ free(md[0]);
+ if (md[1])
+ free(md[1]);
+ printf("Directory %s != %s ::\n\n", argv[0], argv[1]);
+ }
}
- if (!memcmp(md[0], md[1], MD5_DIGEST_LENGTH)) {
- free(md[0]);
- free(md[1]);
- printf("Directory %s == %s\n\n", argv[0], argv[1]);
- return 0;
- } else {
- free(md[0]);
- free(md[1]);
- printf("Directory %s != %s ::\n\n", argv[0], argv[1]);
- }
- if (cmpDir(argv[0], argv[1], &list) == -1)
+ if (lm < 4 && cmpDir(argv[0], argc > 1 ? argv[1] : NULL, &list) == -1)
return 127;
+ if (lm & 2) {
+ f = fopen(szFName, "w");
+ if (!f) {
+ printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno));
+ if (list)
+ free(list);
+ return 0;
+ }
+ }
for (i = 0; list[i].ch; i++)
- printf("%c %s %s\n", list[i].ch, list[i].name, list[i].extra);
- printf("\nTotal count of elements = %d\n", i);
+ fprintf(f, "%c %s %s\n", list[i].ch, list[i].name, list[i].extra);
+ if (lm & 2)
+ fclose(f);
+ printf("\nTotal count of elements = %d\n", i);
free(list);
return 1;
}