From b509fd0dc82fd72a7409bf11478e2a289aa0fe30 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Tue, 2 May 2006 14:37:26 +0000 Subject: [PATCH] Stefan Fiedler: mine: directories are always unmodified misc/tools-source/getfiles.c: stat symlinks, not the files they point to git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7573 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/tools-source/getfiles.c | 2 +- package/base/mine/special-files.patch | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/misc/tools-source/getfiles.c b/misc/tools-source/getfiles.c index 20c0379f7..5b0cc7b9c 100644 --- a/misc/tools-source/getfiles.c +++ b/misc/tools-source/getfiles.c @@ -34,7 +34,7 @@ int main(int argc, char ** argv) { while ( fgets(buf, 512, stdin) != NULL && (fn = strchr(buf, ' ')) != NULL ) { if ( (n = strchr(++fn, '\n')) != NULL ) *n = '\0'; - if ( !stat(fn,&st) && !S_ISDIR(st.st_mode) ) + if ( !lstat(fn,&st) && !S_ISDIR(st.st_mode) ) puts(fn); } return 0; diff --git a/package/base/mine/special-files.patch b/package/base/mine/special-files.patch index 55b369e78..f9fa05711 100644 --- a/package/base/mine/special-files.patch +++ b/package/base/mine/special-files.patch @@ -71,13 +71,13 @@ diff -dur mine-0.24/md5sum.c mine-0.24-patch/md5sum.c #include #include -@@ -37,35 +38,39 @@ +@@ -37,35 +38,42 @@ struct stat statbuf; snprintf(realfilename, 1024, "%s/%s", root, filename); - return (stat(realfilename, &statbuf) != 0 || S_ISFIFO(statbuf.st_mode)) - ? "" : md5_file(realfilename); -+ if (stat(realfilename, &statbuf) != 0) ++ if (lstat(realfilename, &statbuf) != 0 || S_ISDIR(statbuf.st_mode)) + return ""; + else if (!S_ISREG(statbuf.st_mode)) + return "X"; @@ -97,6 +97,9 @@ diff -dur mine-0.24/md5sum.c mine-0.24-patch/md5sum.c - if (md5_f == NULL || strcmp(md5_f, "") == 0) - return 0; + ++/* printf ("md5sum_check(): md5_f: %s, md5_d: %s\n", ++ (md5_f) ? md5_f : "NULL", (md5_d) ? md5_d : "NULL"); ++*/ + if (strcmp(md5_f, "") == 0) + return MD5SUM_CHECK_OK; else if (md5_d == NULL)