X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmake_ext4fs.git;a=blobdiff_plain;f=make_ext4fs_main.c;h=88254c321a7808558f55ee2a184c65aa65c75d14;hp=57d263b500b1174b05eae63b5c0ae1de1e41476a;hb=HEAD;hpb=58ace71d8c43d74a76ba8fd1938281ef2387e1eb

diff --git a/make_ext4fs_main.c b/make_ext4fs_main.c
index 57d263b..88254c3 100644
--- a/make_ext4fs_main.c
+++ b/make_ext4fs_main.c
@@ -25,18 +25,9 @@
 #include <sys/disk.h>
 #endif
 
-#ifdef ANDROID
-#include <private/android_filesystem_config.h>
-#endif
-
-#include "make_ext4fs.h"
 #include "ext4_utils.h"
 #include "canned_fs_config.h"
 
-#ifndef USE_MINGW /* O_BINARY is windows-specific flag */
-#define O_BINARY 0
-#endif
-
 extern struct fs_info info;
 
 
@@ -44,7 +35,7 @@ static void usage(char *path)
 {
 	fprintf(stderr, "%s [ -l <len> ] [ -j <journal size> ] [ -b <block_size> ]\n", basename(path));
 	fprintf(stderr, "    [ -g <blocks per group> ] [ -i <inodes> ] [ -I <inode size> ]\n");
-	fprintf(stderr, "    [ -L <label> ] [ -f ] [ -a <android mountpoint> ]\n");
+	fprintf(stderr, "    [ -m <reserved blocks percent> ] [ -L <label> ] [ -f ]\n");
 	fprintf(stderr, "    [ -S file_contexts ] [ -C fs_config ] [ -T timestamp ]\n");
 	fprintf(stderr, "    [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -v ] [ -B <block_list_file> ]\n");
 	fprintf(stderr, "    <filename> [<directory>]\n");
@@ -55,7 +46,6 @@ int main(int argc, char **argv)
 	int opt;
 	const char *filename = NULL;
 	const char *directory = NULL;
-	char *mountpoint = NULL;
 	fs_config_func_t fs_config_func = NULL;
 	const char *fs_config_file = NULL;
 	int gzip = 0;
@@ -68,7 +58,7 @@ int main(int argc, char **argv)
 	time_t fixed_time = -1;
 	FILE* block_list_file = NULL;
 
-	while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:T:C:B:fwzJsctv")) != -1) {
+	while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:T:C:B:m:fwzJsctv")) != -1) {
 		switch (opt) {
 		case 'l':
 			info.len = parse_num(optarg);
@@ -94,15 +84,6 @@ int main(int argc, char **argv)
 		case 'f':
 			force = 1;
 			break;
-		case 'a':
-#ifdef ANDROID
-			mountpoint = optarg;
-#else
-			fprintf(stderr, "can't set android permissions - built without android support\n");
-			usage(argv[0]);
-			exit(EXIT_FAILURE);
-#endif
-			break;
 		case 'w':
 			wipe = 1;
 			break;
@@ -137,6 +118,9 @@ int main(int argc, char **argv)
 				exit(EXIT_FAILURE);
 			}
 			break;
+		case 'm':
+			info.reserve_pcnt = strtoul(optarg, NULL, 0);
+			break;
 		default: /* '?' */
 			usage(argv[0]);
 			exit(EXIT_FAILURE);
@@ -181,7 +165,7 @@ int main(int argc, char **argv)
 	}
 
 	if (strcmp(filename, "-")) {
-		fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
+		fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
 		if (fd < 0) {
 			perror("open");
 			return EXIT_FAILURE;
@@ -190,7 +174,7 @@ int main(int argc, char **argv)
 		fd = STDOUT_FILENO;
 	}
 
-	exitcode = make_ext4fs_internal(fd, directory, mountpoint, fs_config_func, gzip,
+	exitcode = make_ext4fs_internal(fd, directory, fs_config_func, gzip,
 		sparse, crc, wipe, verbose, fixed_time, block_list_file);
 	close(fd);
 	if (block_list_file)