Some bf(...) tweaks.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index dc37c04..32dd591 100644 (file)
--- a/util.c
+++ b/util.c
@@ -45,7 +45,7 @@ void set_nonblocking(int fd)
 {
        int val;
 
-       if ((val = fcntl(fd, F_GETFL, 0)) == -1)
+       if ((val = fcntl(fd, F_GETFL)) == -1)
                return;
        if (!(val & NONBLOCK_FLAG)) {
                val |= NONBLOCK_FLAG;
@@ -58,7 +58,7 @@ void set_blocking(int fd)
 {
        int val;
 
-       if ((val = fcntl(fd, F_GETFL, 0)) == -1)
+       if ((val = fcntl(fd, F_GETFL)) == -1)
                return;
        if (val & NONBLOCK_FLAG) {
                val &= ~NONBLOCK_FLAG;
@@ -109,13 +109,13 @@ void print_child_argv(char **cmd)
        rprintf(FCLIENT, "\n");
 }
 
-void out_of_memory(char *str)
+NORETURN void out_of_memory(char *str)
 {
        rprintf(FERROR, "ERROR: out of memory in %s [%s]\n", str, who_am_i());
        exit_cleanup(RERR_MALLOC);
 }
 
-void overflow_exit(char *str)
+NORETURN void overflow_exit(char *str)
 {
        rprintf(FERROR, "ERROR: buffer overflow in %s [%s]\n", str, who_am_i());
        exit_cleanup(RERR_MALLOC);
@@ -145,8 +145,10 @@ int set_modtime(char *fname, time_t modtime, mode_t mode)
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;
 # ifdef HAVE_LUTIMES
-               if (S_ISLNK(mode))
-                       return lutimes(fname, t);
+               if (S_ISLNK(mode)) {
+                       lutimes(fname, t);
+                       return 0; /* ignore errors */
+               }
 # endif
                return utimes(fname, t);
 #elif defined HAVE_UTIMBUF
@@ -359,7 +361,7 @@ int robust_unlink(const char *fname)
        /* start where the last one left off to reduce chance of clashes */
        start = counter;
        do {
-               sprintf(&path[pos], "%03d", counter);
+               snprintf(&path[pos], MAX_RENAMES_DIGITS+1, "%03d", counter);
                if (++counter >= MAX_RENAMES)
                        counter = 1;
        } while ((rc = access(path, 0)) == 0 && counter != start);
@@ -612,8 +614,8 @@ void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr)
 void strlower(char *s)
 {
        while (*s) {
-               if (isupper(*(unsigned char *)s))
-                       *s = tolower(*(unsigned char *)s);
+               if (isUpper(s))
+                       *s = toLower(s);
                s++;
        }
 }
@@ -864,7 +866,7 @@ char *sanitize_path(char *dest, const char *p, const char *rootdir, int depth,
 /* Like chdir(), but it keeps track of the current directory (in the
  * global "curr_dir"), and ensures that the path size doesn't overflow.
  * Also cleans the path using the clean_fname() function. */
-int push_dir(char *dir, int set_path_only)
+int push_dir(const char *dir, int set_path_only)
 {
        static int initialised;
        unsigned int len;
@@ -911,7 +913,7 @@ int push_dir(char *dir, int set_path_only)
  * Reverse a push_dir() call.  You must pass in an absolute path
  * that was copied from a prior value of "curr_dir".
  **/
-int pop_dir(char *dir)
+int pop_dir(const char *dir)
 {
        if (chdir(dir))
                return 0;
@@ -1115,7 +1117,7 @@ char *human_num(int64 num)
                        units = 'K';
                }
                if (units) {
-                       sprintf(bufs[n], "%.2f%c", dnum, units);
+                       snprintf(bufs[n], sizeof bufs[0], "%.2f%c", dnum, units);
                        return bufs[n];
                }
        }
@@ -1139,7 +1141,7 @@ char *human_dnum(double dnum, int decimal_digits)
 {
        char *buf = human_num(dnum);
        int len = strlen(buf);
-       if (isdigit(*(uchar*)(buf+len-1))) {
+       if (isDigit(buf + len - 1)) {
                /* There's extra room in buf prior to the start of the num. */
                buf -= decimal_digits + 1;
                snprintf(buf, len + decimal_digits + 2, "%.*f", decimal_digits, dnum);
@@ -1307,7 +1309,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
                        if (strcmp(s+1, "orig") == 0)
                                continue;
                } else if (s_len > 2 && had_tilde
-                   && s[1] == '~' && isdigit(*(uchar*)(s+2)))
+                   && s[1] == '~' && isDigit(s + 2))
                        continue;
                *len_ptr = s_len;
                suf = s;
@@ -1315,7 +1317,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
                        break;
                /* Determine if the suffix is all digits. */
                for (s++, s_len--; s_len > 0; s++, s_len--) {
-                       if (!isdigit(*(uchar*)s))
+                       if (!isDigit(s))
                                return suf;
                }
                /* An all-digit suffix may not be that signficant. */