using [xa]sprintf for string concatenation is neat and saves
~100 bytes according to bloatcheck. Also this fixes bug in rpm
This commit is contained in:
@@ -1212,9 +1212,7 @@ int gzip_main(int argc, char **argv)
|
||||
time_stamp = statBuf.st_ctime;
|
||||
|
||||
if (!tostdout) {
|
||||
path = xmalloc(strlen(argv[i]) + 4);
|
||||
strcpy(path, argv[i]);
|
||||
strcat(path, ".gz");
|
||||
path = xasprintf("%s.gz", argv[i]);
|
||||
|
||||
/* Open output file */
|
||||
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW
|
||||
|
||||
@@ -290,8 +290,7 @@ static void fileaction_dobackup(char *filename, int fileref)
|
||||
if (rpm_getint(RPMTAG_FILEFLAGS, fileref) & RPMFILE_CONFIG) { /* Only need to backup config files */
|
||||
stat_res = lstat (filename, &oldfile);
|
||||
if (stat_res == 0 && S_ISREG(oldfile.st_mode)) { /* File already exists - really should check MD5's etc to see if different */
|
||||
newname = xstrdup(filename);
|
||||
newname = strcat(newname, ".rpmorig");
|
||||
newname = xasprintf("%s.rpmorig", filename);
|
||||
copy_file(filename, newname, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS);
|
||||
remove_file(filename, FILEUTILS_RECUR | FILEUTILS_FORCE);
|
||||
free(newname);
|
||||
|
||||
Reference in New Issue
Block a user