svn commit: trunk/busybox/archival

vda at busybox.net vda at busybox.net
Sun Sep 3 14:23:29 UTC 2006


Author: vda
Date: 2006-09-03 07:23:29 -0700 (Sun, 03 Sep 2006)
New Revision: 16042

Log:
archival: added O_TRUNC so that when we overwrite files on unpack,
          we truncate them. Also spotted & fixed hard to trigger bug
          with extension handling.



Modified:
   trunk/busybox/archival/bunzip2.c
   trunk/busybox/archival/gunzip.c
   trunk/busybox/archival/uncompress.c
   trunk/busybox/archival/unlzma.c
   trunk/busybox/archival/unzip.c


Changeset:
Modified: trunk/busybox/archival/bunzip2.c
===================================================================
--- trunk/busybox/archival/bunzip2.c	2006-09-03 14:04:33 UTC (rev 16041)
+++ trunk/busybox/archival/bunzip2.c	2006-09-03 14:23:29 UTC (rev 16042)
@@ -41,17 +41,20 @@
 
 	if (filename) {
 		struct stat stat_buf;
-		char *extension=filename+strlen(filename)-4;
-		if (strcmp(extension, ".bz2") != 0) {
+		/* extension = filename+strlen(filename)-4 is buggy:
+		 * strlen may be less than 4 */
+		char *extension = strrchr(filename, '.');
+		if (!extension || strcmp(extension, ".bz2") != 0) {
 			bb_error_msg_and_die("Invalid extension");
 		}
 		xstat(filename, &stat_buf);
-		*extension=0;
-		dst_fd = xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
+		*extension = '\0';
+		dst_fd = xopen3(filename, O_WRONLY | O_CREAT | O_TRUNC,
+				stat_buf.st_mode);
 	} else dst_fd = STDOUT_FILENO;
 	status = uncompressStream(src_fd, dst_fd);
 	if(filename) {
-		if (!status) filename[strlen(filename)]='.';
+		if (!status) filename[strlen(filename)] = '.';
 		if (unlink(filename) < 0) {
 			bb_error_msg_and_die("Couldn't remove %s", filename);
 		}

Modified: trunk/busybox/archival/gunzip.c
===================================================================
--- trunk/busybox/archival/gunzip.c	2006-09-03 14:04:33 UTC (rev 16041)
+++ trunk/busybox/archival/gunzip.c	2006-09-03 14:23:29 UTC (rev 16042)
@@ -98,7 +98,8 @@
 			}
 
 			/* Open output file (with correct permissions) */
-			dst_fd = xopen3(new_path, O_WRONLY | O_CREAT, stat_buf.st_mode);
+			dst_fd = xopen3(new_path, O_WRONLY | O_CREAT | O_TRUNC,
+					stat_buf.st_mode);
 
 			/* If unzip succeeds remove the old file */
 			delete_path = old_path;

Modified: trunk/busybox/archival/uncompress.c
===================================================================
--- trunk/busybox/archival/uncompress.c	2006-09-03 14:04:33 UTC (rev 16041)
+++ trunk/busybox/archival/uncompress.c	2006-09-03 14:23:29 UTC (rev 16042)
@@ -55,7 +55,8 @@
 
 			/* Open output file */
 			xstat(compressed_file, &stat_buf);
-			dst_fd = xopen3(uncompressed_file, O_WRONLY | O_CREAT,
+			dst_fd = xopen3(uncompressed_file,
+					O_WRONLY | O_CREAT | O_TRUNC,
 					stat_buf.st_mode);
 
 			/* If unzip succeeds remove the old file */

Modified: trunk/busybox/archival/unlzma.c
===================================================================
--- trunk/busybox/archival/unlzma.c	2006-09-03 14:04:33 UTC (rev 16041)
+++ trunk/busybox/archival/unlzma.c	2006-09-03 14:23:29 UTC (rev 16042)
@@ -37,14 +37,15 @@
 
 	if (filename) {
 		struct stat stat_buf;
-		char *extension = filename + strlen(filename) - 5;
-
-		if (strcmp(extension, ".lzma") != 0) {
+		/* bug: char *extension = filename + strlen(filename) - 5; */
+		char *extension = strrchr(filename, '.');
+		if (!extension || strcmp(extension, ".lzma") != 0) {
 			bb_error_msg_and_die("Invalid extension");
 		}
 		xstat(filename, &stat_buf);
-		*extension = 0;
-		dst_fd = xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
+		*extension = '\0';
+		dst_fd = xopen3(filename, O_WRONLY | O_CREAT | O_TRUNC,
+				stat_buf.st_mode);
 	} else
 		dst_fd = STDOUT_FILENO;
 	status = unlzma(src_fd, dst_fd);

Modified: trunk/busybox/archival/unzip.c
===================================================================
--- trunk/busybox/archival/unzip.c	2006-09-03 14:04:33 UTC (rev 16041)
+++ trunk/busybox/archival/unzip.c	2006-09-03 14:23:29 UTC (rev 16042)
@@ -333,7 +333,7 @@
 			overwrite = o_always;
 		case 'y': /* Open file and fall into unzip */
 			unzip_create_leading_dirs(dst_fn);
-			dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT, 0777);
+			dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT | O_TRUNC, 0777);
 		case -1: /* Unzip */
 			if (verbosity == v_normal) {
 				printf("  inflating: %s\n", dst_fn);




More information about the busybox-cvs mailing list