X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ff530f04a002cad5a849e83d4e16cecc2b528358..2dc7b8bd0e8d4a2d91334b9bb458df146b1700e8:/util.c

diff --git a/util.c b/util.c
index 6526a3d9..540fdf5d 100644
--- a/util.c
+++ b/util.c
@@ -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);
@@ -359,7 +359,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 +612,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++;
 	}
 }
@@ -1115,7 +1115,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 +1139,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 +1307,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 +1315,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. */