diff options
author | Matt Kraai <kraai@debian.org> | 2001-01-31 19:00:21 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-01-31 19:00:21 +0000 |
commit | dd19c6990496023fe23fefef8f1798740f7d39c6 (patch) | |
tree | 3933adefa4171173db78fa2389146ac89f4edb86 /archival | |
parent | 63ec2732454a0c973305794e185e488106f6b282 (diff) | |
download | busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.gz busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.bz2 busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.zip |
Removed trailing \n from error_msg{,_and_die} messages.
Diffstat (limited to 'archival')
-rw-r--r-- | archival/ar.c | 6 | ||||
-rw-r--r-- | archival/dpkg_deb.c | 8 | ||||
-rw-r--r-- | archival/gunzip.c | 16 | ||||
-rw-r--r-- | archival/gzip.c | 12 | ||||
-rw-r--r-- | archival/tar.c | 40 |
5 files changed, 41 insertions, 41 deletions
diff --git a/archival/ar.c b/archival/ar.c index 550b2a1c4..5aba30de0 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
@@ -65,9 +65,9 @@ extern ar_headers_t get_headers(int srcFd) | |||
65 | 65 | ||
66 | /* check ar magic */ | 66 | /* check ar magic */ |
67 | if (full_read(srcFd, ar_magic, 8) != 8) | 67 | if (full_read(srcFd, ar_magic, 8) != 8) |
68 | error_msg_and_die("cannot read magic\n"); | 68 | error_msg_and_die("cannot read magic"); |
69 | if (strncmp(ar_magic,"!<arch>",7) != 0) | 69 | if (strncmp(ar_magic,"!<arch>",7) != 0) |
70 | error_msg_and_die("invalid magic\n"); | 70 | error_msg_and_die("invalid magic"); |
71 | 71 | ||
72 | while (full_read(srcFd, (char *) &raw_ar_header, 60)==60) { | 72 | while (full_read(srcFd, (char *) &raw_ar_header, 60)==60) { |
73 | /* check the end of header markers are valid */ | 73 | /* check the end of header markers are valid */ |
@@ -168,7 +168,7 @@ extern int ar_main(int argc, char **argv) | |||
168 | usage(ar_usage); | 168 | usage(ar_usage); |
169 | 169 | ||
170 | if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) | 170 | if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) |
171 | error_msg_and_die("Cannot read %s\n", argv[optind]); | 171 | error_msg_and_die("Cannot read %s", argv[optind]); |
172 | 172 | ||
173 | optind++; | 173 | optind++; |
174 | head = get_headers(srcFd); | 174 | head = get_headers(srcFd); |
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 3a789379b..3345c273f 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c | |||
@@ -118,7 +118,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
118 | extract_flag = TRUE; | 118 | extract_flag = TRUE; |
119 | strcpy(ar_filename, "data.tar.gz"); | 119 | strcpy(ar_filename, "data.tar.gz"); |
120 | if ( (optind + 2) > argc ) { | 120 | if ( (optind + 2) > argc ) { |
121 | error_msg_and_die("No directory specified\n"); | 121 | error_msg_and_die("No directory specified"); |
122 | } | 122 | } |
123 | target_dir = (char *) xmalloc(strlen(argv[optind+1])); | 123 | target_dir = (char *) xmalloc(strlen(argv[optind+1])); |
124 | strcpy(target_dir, argv[optind+1]); | 124 | strcpy(target_dir, argv[optind+1]); |
@@ -128,7 +128,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
128 | list_flag = TRUE; | 128 | list_flag = TRUE; |
129 | strcpy(ar_filename, "data.tar.gz"); | 129 | strcpy(ar_filename, "data.tar.gz"); |
130 | if ( (optind + 2) > argc ) { | 130 | if ( (optind + 2) > argc ) { |
131 | error_msg_and_die("No directory specified\n"); | 131 | error_msg_and_die("No directory specified"); |
132 | } | 132 | } |
133 | target_dir = (char *) xmalloc(strlen(argv[optind+1])); | 133 | target_dir = (char *) xmalloc(strlen(argv[optind+1])); |
134 | strcpy(target_dir, argv[optind+1]); | 134 | strcpy(target_dir, argv[optind+1]); |
@@ -139,7 +139,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
139 | 139 | ||
140 | *ar_headers = get_headers(srcFd); | 140 | *ar_headers = get_headers(srcFd); |
141 | if (ar_headers->next==NULL) | 141 | if (ar_headers->next==NULL) |
142 | error_msg_and_die("Couldnt find %s in %s\n",ar_filename, argv[optind]); | 142 | error_msg_and_die("Couldnt find %s in %s", ar_filename, argv[optind]); |
143 | 143 | ||
144 | while (ar_headers->next != NULL) { | 144 | while (ar_headers->next != NULL) { |
145 | if (strcmp(ar_headers->name, ar_filename)==0) | 145 | if (strcmp(ar_headers->name, ar_filename)==0) |
@@ -154,7 +154,7 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
154 | mkdir(target_dir, 0755); | 154 | mkdir(target_dir, 0755); |
155 | } | 155 | } |
156 | if (chdir(target_dir)==-1) { | 156 | if (chdir(target_dir)==-1) { |
157 | error_msg_and_die("Cannot change to dir %s\n",argv[optind+1]); | 157 | error_msg_and_die("Cannot change to dir %s", argv[optind+1]); |
158 | } | 158 | } |
159 | } | 159 | } |
160 | status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); | 160 | status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list); |
diff --git a/archival/gunzip.c b/archival/gunzip.c index 09571f91c..48a46083b 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
@@ -297,7 +297,7 @@ int in; /* input file descriptor */ | |||
297 | 297 | ||
298 | method = (int) get_byte(); | 298 | method = (int) get_byte(); |
299 | if (method != DEFLATED) { | 299 | if (method != DEFLATED) { |
300 | error_msg("unknown method %d -- get newer version of gzip\n", method); | 300 | error_msg("unknown method %d -- get newer version of gzip", method); |
301 | exit_code = ERROR; | 301 | exit_code = ERROR; |
302 | return -1; | 302 | return -1; |
303 | } | 303 | } |
@@ -1116,11 +1116,11 @@ int in, out; /* input and output file descriptors */ | |||
1116 | if (res == 3) { | 1116 | if (res == 3) { |
1117 | error_msg(memory_exhausted); | 1117 | error_msg(memory_exhausted); |
1118 | } else if (res != 0) { | 1118 | } else if (res != 0) { |
1119 | error_msg("invalid compressed data--format violated\n"); | 1119 | error_msg("invalid compressed data--format violated"); |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | } else { | 1122 | } else { |
1123 | error_msg("internal error, invalid method\n"); | 1123 | error_msg("internal error, invalid method"); |
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | /* Get the crc and original length */ | 1126 | /* Get the crc and original length */ |
@@ -1149,15 +1149,15 @@ int in, out; /* input and output file descriptors */ | |||
1149 | 1149 | ||
1150 | /* Validate decompression */ | 1150 | /* Validate decompression */ |
1151 | if (orig_crc != updcrc(outbuf, 0)) { | 1151 | if (orig_crc != updcrc(outbuf, 0)) { |
1152 | error_msg("invalid compressed data--crc error\n"); | 1152 | error_msg("invalid compressed data--crc error"); |
1153 | } | 1153 | } |
1154 | if (orig_len != (ulg) bytes_out) { | 1154 | if (orig_len != (ulg) bytes_out) { |
1155 | error_msg("invalid compressed data--length error\n"); | 1155 | error_msg("invalid compressed data--length error"); |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | /* Check if there are more entries in a pkzip file */ | 1158 | /* Check if there are more entries in a pkzip file */ |
1159 | if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) { | 1159 | if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) { |
1160 | fprintf(stderr, "has more than one entry--rest ignored\n"); | 1160 | error_msg("has more than one entry--rest ignored"); |
1161 | if (exit_code == OK) | 1161 | if (exit_code == OK) |
1162 | exit_code = WARNING; | 1162 | exit_code = WARNING; |
1163 | } | 1163 | } |
@@ -1261,9 +1261,9 @@ int gunzip_main(int argc, char **argv) | |||
1261 | } | 1261 | } |
1262 | 1262 | ||
1263 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) | 1263 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) |
1264 | error_msg_and_die( "data not read from terminal. Use -f to force it.\n"); | 1264 | error_msg_and_die( "data not read from terminal. Use -f to force it."); |
1265 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) | 1265 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) |
1266 | error_msg_and_die( "data not written to terminal. Use -f to force it.\n"); | 1266 | error_msg_and_die( "data not written to terminal. Use -f to force it."); |
1267 | 1267 | ||
1268 | gunzip_init(); | 1268 | gunzip_init(); |
1269 | 1269 | ||
diff --git a/archival/gzip.c b/archival/gzip.c index 5a74868c1..75f3caa35 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -1382,7 +1382,7 @@ int length; | |||
1382 | (char *) window + start, length) != EQUAL) { | 1382 | (char *) window + start, length) != EQUAL) { |
1383 | fprintf(stderr, | 1383 | fprintf(stderr, |
1384 | " start %d, match %d, length %d\n", start, match, length); | 1384 | " start %d, match %d, length %d\n", start, match, length); |
1385 | error_msg("invalid match\n"); | 1385 | error_msg("invalid match"); |
1386 | } | 1386 | } |
1387 | if (verbose > 1) { | 1387 | if (verbose > 1) { |
1388 | fprintf(stderr, "\\[%d,%d]", start - match, length); | 1388 | fprintf(stderr, "\\[%d,%d]", start - match, length); |
@@ -1822,9 +1822,9 @@ int gzip_main(int argc, char **argv) | |||
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) | 1824 | if (isatty(fileno(stdin)) && fromstdin==1 && force==0) |
1825 | error_msg_and_die( "data not read from terminal. Use -f to force it.\n"); | 1825 | error_msg_and_die( "data not read from terminal. Use -f to force it."); |
1826 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) | 1826 | if (isatty(fileno(stdout)) && tostdout==1 && force==0) |
1827 | error_msg_and_die( "data not written to terminal. Use -f to force it.\n"); | 1827 | error_msg_and_die( "data not written to terminal. Use -f to force it."); |
1828 | 1828 | ||
1829 | foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; | 1829 | foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; |
1830 | if (foreground) { | 1830 | if (foreground) { |
@@ -2894,7 +2894,7 @@ int eof; /* true if this is the last block for a file */ | |||
2894 | #endif | 2894 | #endif |
2895 | /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ | 2895 | /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ |
2896 | if (buf == (char *) 0) | 2896 | if (buf == (char *) 0) |
2897 | error_msg("block vanished\n"); | 2897 | error_msg("block vanished"); |
2898 | 2898 | ||
2899 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ | 2899 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ |
2900 | compressed_len = stored_len << 3; | 2900 | compressed_len = stored_len << 3; |
@@ -3077,7 +3077,7 @@ local void set_file_type() | |||
3077 | bin_freq += dyn_ltree[n++].Freq; | 3077 | bin_freq += dyn_ltree[n++].Freq; |
3078 | *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; | 3078 | *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; |
3079 | if (*file_type == BINARY && translate_eol) { | 3079 | if (*file_type == BINARY && translate_eol) { |
3080 | error_msg("-l used on binary file\n"); | 3080 | error_msg("-l used on binary file"); |
3081 | } | 3081 | } |
3082 | } | 3082 | } |
3083 | 3083 | ||
@@ -3239,7 +3239,7 @@ char *env; /* name of environment variable */ | |||
3239 | 3239 | ||
3240 | /* Copy the program name first */ | 3240 | /* Copy the program name first */ |
3241 | if (oargc-- < 0) | 3241 | if (oargc-- < 0) |
3242 | error_msg("argc<=0\n"); | 3242 | error_msg("argc<=0"); |
3243 | *(nargv++) = *(oargv++); | 3243 | *(nargv++) = *(oargv++); |
3244 | 3244 | ||
3245 | /* Then copy the environment args */ | 3245 | /* Then copy the environment args */ |
diff --git a/archival/tar.c b/archival/tar.c index 308291455..60744e8db 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -165,10 +165,10 @@ extern int tar_unzip_init(int tarFd) | |||
165 | signal(SIGCHLD, child_died); | 165 | signal(SIGCHLD, child_died); |
166 | 166 | ||
167 | if (pipe(unzip_pipe)!=0) | 167 | if (pipe(unzip_pipe)!=0) |
168 | error_msg_and_die("pipe error\n"); | 168 | error_msg_and_die("pipe error"); |
169 | 169 | ||
170 | if ( (child_pid = fork()) == -1) | 170 | if ( (child_pid = fork()) == -1) |
171 | error_msg_and_die("fork failure\n"); | 171 | error_msg_and_die("fork failure"); |
172 | 172 | ||
173 | if (child_pid==0) { | 173 | if (child_pid==0) { |
174 | /* child process */ | 174 | /* child process */ |
@@ -259,7 +259,7 @@ extern int tar_main(int argc, char **argv) | |||
259 | break; | 259 | break; |
260 | case 'f': | 260 | case 'f': |
261 | if (*tarName != '-') | 261 | if (*tarName != '-') |
262 | error_msg_and_die( "Only one 'f' option allowed\n"); | 262 | error_msg_and_die( "Only one 'f' option allowed"); |
263 | tarName = optarg; | 263 | tarName = optarg; |
264 | break; | 264 | break; |
265 | #if defined BB_FEATURE_TAR_EXCLUDE | 265 | #if defined BB_FEATURE_TAR_EXCLUDE |
@@ -294,11 +294,11 @@ extern int tar_main(int argc, char **argv) | |||
294 | */ | 294 | */ |
295 | if (createFlag == TRUE) { | 295 | if (createFlag == TRUE) { |
296 | #ifndef BB_FEATURE_TAR_CREATE | 296 | #ifndef BB_FEATURE_TAR_CREATE |
297 | error_msg_and_die( "This version of tar was not compiled with tar creation support.\n"); | 297 | error_msg_and_die( "This version of tar was not compiled with tar creation support."); |
298 | #else | 298 | #else |
299 | #ifdef BB_FEATURE_TAR_GZIP | 299 | #ifdef BB_FEATURE_TAR_GZIP |
300 | if (unzipFlag==TRUE) | 300 | if (unzipFlag==TRUE) |
301 | error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n"); | 301 | error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip"); |
302 | #endif | 302 | #endif |
303 | status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList); | 303 | status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList); |
304 | #endif | 304 | #endif |
@@ -330,7 +330,7 @@ extern int tar_main(int argc, char **argv) | |||
330 | return EXIT_FAILURE; | 330 | return EXIT_FAILURE; |
331 | 331 | ||
332 | flagError: | 332 | flagError: |
333 | error_msg_and_die( "Exactly one of 'c', 'x' or 't' must be specified\n"); | 333 | error_msg_and_die( "Exactly one of 'c', 'x' or 't' must be specified"); |
334 | } | 334 | } |
335 | 335 | ||
336 | static void | 336 | static void |
@@ -383,7 +383,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag) | |||
383 | } | 383 | } |
384 | if ( (readSize = full_read(header->tarFd, buffer, readSize)) <= 0 ) { | 384 | if ( (readSize = full_read(header->tarFd, buffer, readSize)) <= 0 ) { |
385 | /* Tarball seems to have a problem */ | 385 | /* Tarball seems to have a problem */ |
386 | error_msg("Unexpected EOF in archive\n"); | 386 | error_msg("Unexpected EOF in archive"); |
387 | return( FALSE); | 387 | return( FALSE); |
388 | } | 388 | } |
389 | if ( readSize < writeSize ) | 389 | if ( readSize < writeSize ) |
@@ -476,7 +476,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag) | |||
476 | /* Do not change permissions or date on symlink, | 476 | /* Do not change permissions or date on symlink, |
477 | * since it changes the pointed to file instead. duh. */ | 477 | * since it changes the pointed to file instead. duh. */ |
478 | #else | 478 | #else |
479 | error_msg("%s: Cannot create symlink to '%s': %s\n", | 479 | error_msg("%s: Cannot create symlink to '%s': %s", |
480 | header->name, header->linkname, | 480 | header->name, header->linkname, |
481 | "symlinks not supported"); | 481 | "symlinks not supported"); |
482 | #endif | 482 | #endif |
@@ -543,7 +543,7 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header) | |||
543 | ++*(header->name); | 543 | ++*(header->name); |
544 | 544 | ||
545 | if (alreadyWarned == FALSE) { | 545 | if (alreadyWarned == FALSE) { |
546 | error_msg("Removing leading '/' from member names\n"); | 546 | error_msg("Removing leading '/' from member names"); |
547 | alreadyWarned = TRUE; | 547 | alreadyWarned = TRUE; |
548 | } | 548 | } |
549 | } | 549 | } |
@@ -644,7 +644,7 @@ extern int readTarFile(int tarFd, int extractFlag, int listFlag, | |||
644 | goto endgame; | 644 | goto endgame; |
645 | } else { | 645 | } else { |
646 | errorFlag=TRUE; | 646 | errorFlag=TRUE; |
647 | error_msg("Bad tar header, skipping\n"); | 647 | error_msg("Bad tar header, skipping"); |
648 | continue; | 648 | continue; |
649 | } | 649 | } |
650 | } | 650 | } |
@@ -791,7 +791,7 @@ extern int readTarFile(int tarFd, int extractFlag, int listFlag, | |||
791 | break; | 791 | break; |
792 | #endif | 792 | #endif |
793 | default: | 793 | default: |
794 | error_msg("Unknown file type '%c' in tar file\n", header.type); | 794 | error_msg("Unknown file type '%c' in tar file", header.type); |
795 | close( tarFd); | 795 | close( tarFd); |
796 | return( FALSE); | 796 | return( FALSE); |
797 | } | 797 | } |
@@ -803,7 +803,7 @@ extern int readTarFile(int tarFd, int extractFlag, int listFlag, | |||
803 | return ( FALSE); | 803 | return ( FALSE); |
804 | } | 804 | } |
805 | else if (errorFlag==TRUE) { | 805 | else if (errorFlag==TRUE) { |
806 | error_msg( "Error exit delayed from previous errors\n"); | 806 | error_msg( "Error exit delayed from previous errors"); |
807 | return( FALSE); | 807 | return( FALSE); |
808 | } else | 808 | } else |
809 | return( status); | 809 | return( status); |
@@ -813,7 +813,7 @@ endgame: | |||
813 | close( tarFd); | 813 | close( tarFd); |
814 | if ( *(header.name) == '\0' ) { | 814 | if ( *(header.name) == '\0' ) { |
815 | if (errorFlag==TRUE) | 815 | if (errorFlag==TRUE) |
816 | error_msg( "Error exit delayed from previous errors\n"); | 816 | error_msg( "Error exit delayed from previous errors"); |
817 | else | 817 | else |
818 | return( TRUE); | 818 | return( TRUE); |
819 | } | 819 | } |
@@ -1002,7 +1002,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name, | |||
1002 | header.typeflag = REGTYPE; | 1002 | header.typeflag = REGTYPE; |
1003 | putOctal(header.size, sizeof(header.size), statbuf->st_size); | 1003 | putOctal(header.size, sizeof(header.size), statbuf->st_size); |
1004 | } else { | 1004 | } else { |
1005 | error_msg("%s: Unknown file type\n", real_name); | 1005 | error_msg("%s: Unknown file type", real_name); |
1006 | return ( FALSE); | 1006 | return ( FALSE); |
1007 | } | 1007 | } |
1008 | 1008 | ||
@@ -1061,7 +1061,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
1061 | 1061 | ||
1062 | /* It is against the rules to archive a socket */ | 1062 | /* It is against the rules to archive a socket */ |
1063 | if (S_ISSOCK(statbuf->st_mode)) { | 1063 | if (S_ISSOCK(statbuf->st_mode)) { |
1064 | error_msg("%s: socket ignored\n", fileName); | 1064 | error_msg("%s: socket ignored", fileName); |
1065 | return( TRUE); | 1065 | return( TRUE); |
1066 | } | 1066 | } |
1067 | 1067 | ||
@@ -1070,7 +1070,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
1070 | * the new tarball */ | 1070 | * the new tarball */ |
1071 | if (tbInfo->statBuf.st_dev == statbuf->st_dev && | 1071 | if (tbInfo->statBuf.st_dev == statbuf->st_dev && |
1072 | tbInfo->statBuf.st_ino == statbuf->st_ino) { | 1072 | tbInfo->statBuf.st_ino == statbuf->st_ino) { |
1073 | error_msg("%s: file is the archive; skipping\n", fileName); | 1073 | error_msg("%s: file is the archive; skipping", fileName); |
1074 | return( TRUE); | 1074 | return( TRUE); |
1075 | } | 1075 | } |
1076 | 1076 | ||
@@ -1078,7 +1078,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
1078 | while (header_name[0] == '/') { | 1078 | while (header_name[0] == '/') { |
1079 | static int alreadyWarned=FALSE; | 1079 | static int alreadyWarned=FALSE; |
1080 | if (alreadyWarned==FALSE) { | 1080 | if (alreadyWarned==FALSE) { |
1081 | error_msg("Removing leading '/' from member names\n"); | 1081 | error_msg("Removing leading '/' from member names"); |
1082 | alreadyWarned=TRUE; | 1082 | alreadyWarned=TRUE; |
1083 | } | 1083 | } |
1084 | header_name++; | 1084 | header_name++; |
@@ -1111,7 +1111,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
1111 | 1111 | ||
1112 | /* open the file we want to archive, and make sure all is well */ | 1112 | /* open the file we want to archive, and make sure all is well */ |
1113 | if ((inputFileFd = open(fileName, O_RDONLY)) < 0) { | 1113 | if ((inputFileFd = open(fileName, O_RDONLY)) < 0) { |
1114 | error_msg("%s: Cannot open: %s\n", fileName, strerror(errno)); | 1114 | error_msg("%s: Cannot open: %s", fileName, strerror(errno)); |
1115 | return( FALSE); | 1115 | return( FALSE); |
1116 | } | 1116 | } |
1117 | 1117 | ||
@@ -1150,7 +1150,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv, | |||
1150 | 1150 | ||
1151 | /* Make sure there is at least one file to tar up. */ | 1151 | /* Make sure there is at least one file to tar up. */ |
1152 | if (*argv == NULL) | 1152 | if (*argv == NULL) |
1153 | error_msg_and_die("Cowardly refusing to create an empty archive\n"); | 1153 | error_msg_and_die("Cowardly refusing to create an empty archive"); |
1154 | 1154 | ||
1155 | /* Open the tar file for writing. */ | 1155 | /* Open the tar file for writing. */ |
1156 | if (!strcmp(tarName, "-")) | 1156 | if (!strcmp(tarName, "-")) |
@@ -1193,7 +1193,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv, | |||
1193 | /* Hang up the tools, close up shop, head home */ | 1193 | /* Hang up the tools, close up shop, head home */ |
1194 | close(tarFd); | 1194 | close(tarFd); |
1195 | if (errorFlag == TRUE) { | 1195 | if (errorFlag == TRUE) { |
1196 | error_msg("Error exit delayed from previous errors\n"); | 1196 | error_msg("Error exit delayed from previous errors"); |
1197 | freeHardLinkInfo(&tbInfo.hlInfoHead); | 1197 | freeHardLinkInfo(&tbInfo.hlInfoHead); |
1198 | return(FALSE); | 1198 | return(FALSE); |
1199 | } | 1199 | } |