Mention some chanages in the patches dir.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index cde7571..9ebd6ba 100644 (file)
--- a/util.c
+++ b/util.c
@@ -120,7 +120,7 @@ void out_of_memory(char *str)
        exit_cleanup(RERR_MALLOC);
 }
 
-void overflow(char *str)
+void overflow_exit(char *str)
 {
        rprintf(FERROR, "ERROR: buffer overflow in %s\n", str);
        exit_cleanup(RERR_MALLOC);
@@ -128,8 +128,13 @@ void overflow(char *str)
 
 
 
-int set_modtime(char *fname, time_t modtime)
+int set_modtime(char *fname, time_t modtime, mode_t mode)
 {
+#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+       if (S_ISLNK(mode))
+               return 1;
+#endif
+
        if (verbose > 2) {
                rprintf(FINFO, "set modtime of %s to (%ld) %s",
                        safe_fname(fname), (long)modtime,
@@ -140,7 +145,18 @@ int set_modtime(char *fname, time_t modtime)
                return 0;
 
        {
-#ifdef HAVE_UTIMBUF
+#ifdef HAVE_UTIMES
+               struct timeval t[2];
+               t[0].tv_sec = time(NULL);
+               t[0].tv_usec = 0;
+               t[1].tv_sec = modtime;
+               t[1].tv_usec = 0;
+# ifdef HAVE_LUTIMES
+               if (S_ISLNK(mode))
+                       return lutimes(fname, t);
+# endif
+               return utimes(fname, t);
+#elif defined HAVE_UTIMBUF
                struct utimbuf tbuf;
                tbuf.actime = time(NULL);
                tbuf.modtime = modtime;
@@ -151,12 +167,7 @@ int set_modtime(char *fname, time_t modtime)
                t[1] = modtime;
                return utime(fname,t);
 #else
-               struct timeval t[2];
-               t[0].tv_sec = time(NULL);
-               t[0].tv_usec = 0;
-               t[1].tv_sec = modtime;
-               t[1].tv_usec = 0;
-               return utimes(fname,t);
+#error No file-time-modification routine found!
 #endif
        }
 }
@@ -517,7 +528,6 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        filter_server_path(s);
 #else
        glob_t globbuf;
-       int i;
 
        if (maxargs <= argc)
                return;
@@ -542,9 +552,9 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        if (globbuf.gl_pathc == 0)
                argv[argc++] = s;
        else {
-               int j = globbuf.gl_pathc;
+               int i;
                free(s);
-               for (i = 0; i < j; i++) {
+               for (i = 0; i < (int)globbuf.gl_pathc; i++) {
                        if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
                                out_of_memory("glob_expand_one");
                }
@@ -892,7 +902,7 @@ char *safe_fname(const char *fname)
        char *t;
 
        ndx = (ndx + 1) % MAX_SAFE_NAMES;
-       for (t = fbuf[ndx]; *fname && limit; fname++) {
+       for (t = fbuf[ndx]; *fname; fname++) {
                if (*fname == '\\') {
                        if ((limit -= 2) < 0)
                                break;
@@ -904,7 +914,8 @@ char *safe_fname(const char *fname)
                        sprintf(t, "\\%03o", *(uchar*)fname);
                        t += 4;
                } else {
-                       limit--;
+                       if (--limit < 0)
+                               break;
                        *t++ = *fname;
                }
        }