aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-12 19:29:44 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-12 19:29:44 +0000
commita6dbb08a48903cb8f31fad2cf2d1cffa92bd4808 (patch)
treef7f2113941a2dc0385080baa7656ead41f45f834 /archival
parent12f5676cce3b2e04668df3f18f94f1a3c7fdbb9e (diff)
downloadbusybox-w32-a6dbb08a48903cb8f31fad2cf2d1cffa92bd4808.tar.gz
busybox-w32-a6dbb08a48903cb8f31fad2cf2d1cffa92bd4808.tar.bz2
busybox-w32-a6dbb08a48903cb8f31fad2cf2d1cffa92bd4808.zip
small style fixes
Diffstat (limited to 'archival')
-rw-r--r--archival/dpkg.c10
-rw-r--r--archival/tar.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index b55822460..825a8c1d2 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -878,7 +878,8 @@ static void write_status_file(deb_file_t **deb_file)
878 /* remove trailing \n's */ 878 /* remove trailing \n's */
879 write_buffer_no_status(new_status_file, deb_file[i]->control_file); 879 write_buffer_no_status(new_status_file, deb_file[i]->control_file);
880 set_status(status_num, "ok", 2); 880 set_status(status_num, "ok", 2);
881 fprintf(new_status_file, "Status: %s\n\n", name_hashtable[status_hashtable[status_num]->status]); 881 fprintf(new_status_file, "Status: %s\n\n",
882 name_hashtable[status_hashtable[status_num]->status]);
882 write_flag = TRUE; 883 write_flag = TRUE;
883 break; 884 break;
884 } 885 }
@@ -886,7 +887,9 @@ static void write_status_file(deb_file_t **deb_file)
886 } 887 }
887 /* This is temperary, debugging only */ 888 /* This is temperary, debugging only */
888 if (deb_file[i] == NULL) { 889 if (deb_file[i] == NULL) {
889 bb_error_msg_and_die("ALERT: Couldnt find a control file, your status file may be broken, status may be incorrect for %s", package_name); 890 bb_error_msg_and_die("ALERT: cannot find a control file, "
891 "your status file may be broken, status may be "
892 "incorrect for %s", package_name);
890 } 893 }
891 } 894 }
892 else if (strcmp("not-installed", name_hashtable[state_status]) == 0) { 895 else if (strcmp("not-installed", name_hashtable[state_status]) == 0) {
@@ -963,7 +966,8 @@ static void write_status_file(deb_file_t **deb_file)
963 } 966 }
964 967
965 if (rename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status") == -1) { 968 if (rename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status") == -1) {
966 bb_error_msg_and_die("DANGER: Cannot create status file, you need to manually repair your status file"); 969 bb_error_msg_and_die("DANGER: cannot create status file, "
970 "you need to manually repair your status file");
967 } 971 }
968} 972}
969 973
diff --git a/archival/tar.c b/archival/tar.c
index 28bb14776..5ebb3dff4 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -499,7 +499,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag,
499 bb_error_msg("Error exit delayed from previous errors"); 499 bb_error_msg("Error exit delayed from previous errors");
500 500
501 if (gzipPid && waitpid(gzipPid, NULL, 0)==-1) 501 if (gzipPid && waitpid(gzipPid, NULL, 0)==-1)
502 bb_error_msg("Couldnt wait"); 502 bb_error_msg("cannot wait");
503 503
504 return !errorFlag; 504 return !errorFlag;
505} 505}