X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmake_ext4fs.git;a=blobdiff_plain;f=make_ext4fs.c;h=bf5f49fb115f6c2ba37a2aef5f311780aff7f430;hp=edfa25cd623586b1f313e5b311cdbfd98aad2bed;hb=484903e4332be6c317f531b008cb2a841a18c506;hpb=828ec043d24e6963d6fd3957262ff5382e262adc;ds=inline

diff --git a/make_ext4fs.c b/make_ext4fs.c
index edfa25c..bf5f49f 100644
--- a/make_ext4fs.c
+++ b/make_ext4fs.c
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <locale.h>
 
 /* TODO: Not implemented:
    Allocating blocks in the same block group as the file inode
@@ -44,23 +45,23 @@ static int filter_dot(const struct dirent *d)
 	return (strcmp(d->d_name, "..") && strcmp(d->d_name, "."));
 }
 
-static u32 build_default_directory_structure(const char *dir_path)
+static u32 build_default_directory_structure(time_t fixed_time)
 {
 	u32 inode;
 	u32 root_inode;
 	struct dentry dentries = {
-			.filename = "lost+found",
-			.file_type = EXT4_FT_DIR,
-			.mode = S_IRWXU,
-			.uid = 0,
-			.gid = 0,
-			.mtime = 0,
+		.filename = "lost+found",
+		.file_type = EXT4_FT_DIR,
+		.mode = S_IRWXU,
+		.uid = 0,
+		.gid = 0,
+		.mtime = (fixed_time != -1) ? fixed_time : 0,
 	};
 	root_inode = make_directory(0, 1, &dentries, 1);
 	inode = make_directory(root_inode, 0, NULL, 0);
 	*dentries.inode = inode;
 	inode_set_permissions(inode, dentries.mode,
-		dentries.uid, dentries.gid, dentries.mtime);
+	        dentries.uid, dentries.gid, dentries.mtime);
 
 	return root_inode;
 }
@@ -87,6 +88,9 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
 	u32 dirs = 0;
 	bool needs_lost_and_found = false;
 
+	/* alphasort is locale-dependent; let's fix the locale to some sane value */
+	setlocale(LC_COLLATE, "C");
+
 	if (full_path) {
 		entries = scandir(full_path, &namelist, filter_dot, (void*)alphasort);
 		if (entries < 0) {
@@ -384,12 +388,8 @@ int make_ext4fs_internal(int fd, const char *_directory,
 	if (setjmp(setjmp_env))
 		return EXIT_FAILURE; /* Handle a call to longjmp() */
 
-	if (_directory == NULL) {
-		fprintf(stderr, "Need a source directory\n");
-		return EXIT_FAILURE;
-	}
-
-	directory = canonicalize_rel_slashes(_directory);
+	if (_directory)
+		directory = canonicalize_rel_slashes(_directory);
 
 	if (info.len <= 0)
 		info.len = get_file_size(fd);
@@ -474,11 +474,15 @@ int make_ext4fs_internal(int fd, const char *_directory,
 	if (info.feat_compat & EXT4_FEATURE_COMPAT_RESIZE_INODE)
 		ext4_create_resize_inode();
 
-	root_inode_num = build_directory_structure(directory, "", 0,
-		fs_config_func, verbose, fixed_time);
+	if (directory)
+		root_inode_num = build_directory_structure(directory, "", 0,
+			fs_config_func, verbose, fixed_time);
+	else
+		root_inode_num = build_default_directory_structure(fixed_time);
 
 	root_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-	inode_set_permissions(root_inode_num, root_mode, 0, 0, 0);
+	inode_set_permissions(root_inode_num, root_mode, 0, 0,
+		(fixed_time != 1) ? fixed_time : 0);
 
 	ext4_update_free();