Merge pull request #2187 from floriangit/rm_unused_code_cp

remove opt_nocopyzero setting globally, since unused
ghaerr · Jan 19, 2025 · 1fb2a47 · 1fb2a47
2 parents 46e8834 + 446ddcf
commit 1fb2a47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/elks/tools/mfs/mkfs.c b/elks/tools/mfs/mkfs.c
@@ -76,12 +76,12 @@ 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;
+    case 'k':
+      opt_nocopyzero = 1;
+      break;
+    case 'a':
+      opt_appendifexists = 1;
+      break;
     default:
       usage(argv[0]);
     }

diff --git a/elkscmd/file_utils/cp.c b/elkscmd/file_utils/cp.c
@@ -27,7 +27,6 @@
 
 int opt_recurse;	/* implicitly initialized */
 int opt_verbose;
-int opt_nocopyzero;
 int opt_force;
 int whole_disk_copy;
 char *destination_dir;
@@ -329,14 +328,6 @@ static int do_copies(void)
 
 				err |= do_mkdir(inode_build->path, destdir(inode_build->path));
 		} 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 zero length %s\n", inode_build->path);
-					continue;
-				}
-			}
 
 			err |= do_cp(inode_build->path, destdir(inode_build->path));
 		} else if (flags == S_IFCHR) {