system_cmds-550.6.tar.gz

[apple/system_cmds.git] / mkfile.tproj / mkfile.c

diff --git a/mkfile.tproj/mkfile.c b/mkfile.tproj/mkfile.c
index 4aff54858204b864ec810dde4872d610b8484a6d..19eadb9515487a08fa35822be7be1bc0490cb5d8 100644 (file)
--- a/mkfile.tproj/mkfile.c
+++ b/mkfile.tproj/mkfile.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <err.h>
 
 #define BF_SZ  512     /* Size of write chunks */
 
@@ -56,11 +57,12 @@ main (argc, argv)
        char *b_num, *prog_name;
        char *options = "nv";
        char c;
-       quad_t multiplier = 1;
-       quad_t file_size;
+       off_t multiplier = 1;
+       off_t file_size;
        int len;
        int empty = 0;
        int verbose = 0;
+       char* endptr = NULL;
 
        prog_name = argv[0];    /* Get program name */
     if (1 == argc)
@@ -117,8 +119,10 @@ main (argc, argv)
        if (*argv == NULL)              /* Was a file name given? */
                usage(prog_name, options);      
 
-       if ((file_size = strtoq(b_num, NULL, 10)) == 0 )
+       if ((file_size = strtoll(b_num, &endptr, 10)) == 0 &&
+               (*endptr != 0 && endptr != &b_num[len])) {
                err(1, "Bad file size!");
+       }
 
        while ( *argv != NULL ) {       /* Create file for each file_name */
                create_file(*argv, file_size*multiplier, empty, verbose);
@@ -142,9 +146,12 @@ create_file(file_name, size, empty, verbose)
        char buff[BF_SZ];
        int fd, bytes_written = BF_SZ;
        quad_t i;
-    mode_t     mode;
+       mode_t mode = S_IRUSR | S_IWUSR;
+
+       /* If superuser, then set sticky bit */
+       if (!geteuid()) mode |= S_ISVTX;
 
-       if ((fd = open(file_name, O_RDWR | O_CREAT | O_TRUNC )) == -1)
+       if ((fd = open(file_name, O_RDWR | O_CREAT | O_TRUNC, mode)) == -1)
                 err(1, NULL);
 
 
@@ -176,17 +183,11 @@ create_file(file_name, size, empty, verbose)
                }
        }
 
+       if (fchmod(fd, mode))   /* Change permissions */
+               err_rm(file_name, NULL);
 
-       mode = S_IRUSR | S_IWUSR;
-       /* If superuser, then set sticky bit */
-    if (! geteuid())
-               mode |= S_ISVTX;
-
-    if (fchmod(fd, mode))      /* Change permissions */
-        err_rm(file_name, NULL);
-
-    if ((close(fd)) == -1)
-            err_rm(file_name, NULL);
+       if ((close(fd)) == -1)
+               err_rm(file_name, NULL);
 
        if (verbose)
                (void)fprintf(stderr, "%s %qd bytes\n", file_name, size);