revert changes to mfs

ghaerr · Jan 19, 2025 · 446ddcf · 446ddcf
1 parent 4f02835
commit 446ddcf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/elks/tools/mfs/genfs.c b/elks/tools/mfs/genfs.c
@@ -389,6 +389,13 @@ compile_fs(struct minix_fs_dat *fs)
 				av[2] = 0;
 				cmd_mkdir(fs, 2, av, sb.st_mode & 0777);
 			} else if (flags == S_IFREG) {
+				if (opt_nocopyzero && !inode_build->blocks) {
+					char *p = strrchr(inode_build->path, '/');
+					if (p && *++p == '.') {
+						if (opt_verbose) printf("Skipping %s\n", inode_build->path);
+						continue;
+					}
+				}
 				if (opt_verbose) printf("cp %s %s\n", inode_build->path, prefix+inode_build->path);
 				av[0] = "cp";
 				av[1] = inode_build->path;

diff --git a/elks/tools/mfs/mkfs.c b/elks/tools/mfs/mkfs.c
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
+int opt_nocopyzero = 0;		/* don't copy zero-length files starting with . */
 int opt_appendifexists = 0; /* don't create new fs on genfs if exists */
 
 /**
@@ -75,6 +76,9 @@ void parse_mkfs(int argc,char **argv,int *magic_p,int *nblks_p,int *inodes_p) {
     case 's':
       *nblks_p = atoi(optarg);
       break;
+    case 'k':
+      opt_nocopyzero = 1;
+      break;
     case 'a':
       opt_appendifexists = 1;
       break;

diff --git a/elks/tools/mfs/protos.h b/elks/tools/mfs/protos.h
@@ -74,6 +74,7 @@ extern int opt_keepuid;
 extern int opt_fsbad_fatal;
 extern char *toolname;
 
+extern int opt_nocopyzero;
 extern int opt_appendifexists;
 
 extern char *optarg;