Changeset 3114 for trunk/src

Timestamp:

Oct 29, 2017, 7:02:04 PM (8 years ago)

Author:

bird

Message:

kmk_install: added --dos2unix and --unix2dos flags.

Location:

trunk/src

Files:

• kmk/Makefile.am (modified) (1 diff)
• kmk/kmkbuiltin/install.c (modified) (14 diffs)
• kmk/main.c (modified) (2 diffs)
• lib/Makefile.kmk (modified) (1 diff)
• lib/dos2unix.c (added)
• lib/dos2unix.h (added)
• lib/kDep.c (modified) (1 diff)
• lib/testcase (added)
• lib/testcase/dos-text.txt (added)
• lib/testcase/dos2unix-test.cmd (added)
• lib/testcase/mixed-text.txt (added)
• lib/testcase/unix-text.txt (added)

trunk/src/kmk/Makefile.am

@@ -58 +58 @@
                 ../lib/kDep.c \
                 ../lib/kbuild_version.c \
+                ../lib/dos2unix.c \
                 ../lib/maybe_con_fwrite.c \
                 \

trunk/src/kmk/kmkbuiltin/install.c

@@ -91 +91 @@
 #include "kmkbuiltin.h"
 #include "k/kDefs.h"    /* for K_OS */
+#include "dos2unix.h"
 
 
@@ -102 +103 @@
 #ifndef MAXBSIZE
 # define MAXBSIZE 0x20000
-#endif
-
-/* Bootstrap aid - this doesn't exist in most older releases */
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1) /* from <sys/mman.h> */
 #endif
 
@@ -137 +133 @@
 static int ignore_perm_errors;
 static int hard_link_files_when_possible;
+static int dos2unix;
 
 static struct option long_options[] =
@@ -146 +143 @@
     { "hard-link-files-when-possible",                  no_argument, 0, 265 },
     { "no-hard-link-files-when-possible",               no_argument, 0, 266 },
+    { "dos2unix",                                       no_argument, 0, 267 },
+    { "unix2dos",                                       no_argument, 0, 268 },
     { 0, 0,     0, 0 },
 };
 
 
-static int      copy(int, const char *, int, const char *, off_t);
+static int      copy(int, const char *, int *, const char *);
 static int      compare(int, const char *, size_t, int, const char *, size_t);
 static int      create_newfile(const char *, int, struct stat *);
@@ -160 +159 @@
 static int      usage(FILE *);
 static char    *last_slash(const char *);
+static KBOOL    needs_dos2unix_conversion(const char *pszFilename);
+static KBOOL    needs_unix2dos_conversion(const char *pszFilename);
 
 int
@@ -173 +174 @@
         (void)envp;
 
-        /* reinitialize globals */
-        mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-        suffix = BACKUP_SUFFIX;
-        gid = 0;
-        uid = 0;
-        dobackup = docompare = dodir = dopreserve = dostrip = nommap = safecopy = verbose = mode_given = 0;
+        /* reinitialize globals */
+        mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
+        suffix = BACKUP_SUFFIX;
+        gid = 0;
+        uid = 0;
+        dobackup = docompare = dodir = dopreserve = dostrip = nommap = safecopy = verbose = mode_given = 0;
         ignore_perm_errors = geteuid() != 0;
-        hard_link_files_when_possible = 0;
-
-        /* reset getopt and set progname. */
-        g_progname = argv[0];
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
+        hard_link_files_when_possible = 0;
+        dos2unix = 0;
+
+        /* reset getopt and set progname. */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+        optind = 0; /* init */
 
         iflags = 0;
@@ -264 +266 @@
                         hard_link_files_when_possible = 0;
                         break;
+                case 267:
+                        dos2unix = 1;
+                        break;
+                case 268:
+                        dos2unix = -1;
+                        break;
                 case '?':
                 default:
@@ -280 +288 @@
         if (argc == 0 || (argc == 1 && !dodir))
                 return usage(stderr);
+
+        /*   and unix2dos doesn't combine well with a couple of other options. */
+        if (dos2unix != 0) {
+                if (docompare) {
+                        warnx("-C/-p and --dos2unix/unix2dos may not be specified together");
+                        return usage(stderr);
+                }
+                if (dostrip) {
+                        warnx("-s and --dos2unix/unix2dos may not be specified together");
+                        return usage(stderr);
+                }
+        }
 
         /* need to make a temp copy so we can compare stripped version */
@@ -478 +498 @@
                 } else if (gid != (gid_t)-1 && gid != from_sb.st_gid) {
                         why_not = "gid mismatch";
+                } else if (dos2unix > 0 && needs_dos2unix_conversion(from_name)) {
+                        why_not = "dos2unix";
+                } else if (dos2unix < 0 && needs_unix2dos_conversion(from_name)) {
+                        why_not = "unix2dos";
                 } else {
                         int rcLink = link(from_name, to_name);
@@ -544 +568 @@
                 }
                 if (!devnull) {
-                        rc = copy(from_fd, from_name, to_fd,
-                                  tempcopy ? tempfile : to_name, from_sb.st_size);
+                        rc = copy(from_fd, from_name, &to_fd, tempcopy ? tempfile : to_name);
                         if (rc)
                                 goto l_done;
@@ -880 +903 @@
 
 /*
+ * Write error handler.
+ */
+static int write_error(int *ptr_to_fd, const char *to_name, int nw)
+{
+    int serrno = errno;
+    (void)close(*ptr_to_fd);
+    *ptr_to_fd = -1;
+    (void)unlink(to_name);
+    errno = nw > 0 ? EIO : serrno;
+    return err(EX_OSERR, "%s", to_name);
+}
+
+/*
+ * Read error handler.
+ */
+static int read_error(const char *from_name, int *ptr_to_fd, const char *to_name)
+{
+    int serrno = errno;
+    (void)close(*ptr_to_fd);
+    *ptr_to_fd = -1;
+    (void)unlink(to_name);
+    errno = serrno;
+    return err(EX_OSERR, "%s", from_name);
+}
+
+/*
  * copy --
  *      copy from one file to another
  */
 static int
-copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
-    off_t size)
-{
+copy(int from_fd, const char *from_name, int *ptr_to_fd, const char *to_name)
+{
+        KBOOL fPendingCr = K_FALSE;
+        KSIZE cchDst;
         int nr, nw;
-        int serrno;
         char buf[MAXBSIZE];
-
-        (void)size;
+        int to_fd = *ptr_to_fd;
 
         /* Rewind file descriptors. */
@@ -899 +947 @@
                 return err(EX_OSERR, "lseek: %s", to_name);
 
-        while ((nr = read(from_fd, buf, sizeof(buf))) > 0)
-                if ((nw = write(to_fd, buf, nr)) != nr) {
-                        serrno = errno;
-                        (void)unlink(to_name);
-                        errno = nw > 0 ? EIO : serrno;
-                        return err(EX_OSERR, "%s", to_name);
-                }
-        if (nr != 0) {
-                serrno = errno;
-                (void)unlink(to_name);
-                errno = serrno;
-                return err(EX_OSERR, "%s", from_name);
-        }
-        return EX_OK;
+        if (dos2unix == 0) {
+                /*
+                 * Copy bytes, no conversion.
+                 */
+                while ((nr = read(from_fd, buf, sizeof(buf))) > 0)
+                        if ((nw = write(to_fd, buf, nr)) != nr)
+                                return write_error(ptr_to_fd, to_name, nw);
+        } else if (dos2unix > 0) {
+                /*
+                 * CRLF -> LF is a reduction, so we can work with full buffers.
+                 */
+                while ((nr = read(from_fd, buf, sizeof(buf))) > 0) {
+                        if (   fPendingCr
+                                && buf[0] != '\n'
+                                && (nw = write(to_fd, "\r", 1)) != 1)
+                                return write_error(ptr_to_fd, to_name, nw);
+
+                        fPendingCr = dos2unix_convert_to_unix(buf, nr, buf, &cchDst);
+
+                        nw = write(to_fd, buf, cchDst);
+                        if (nw != (int)cchDst)
+                                return write_error(ptr_to_fd, to_name, nw);
+                }
+        } else {
+                /*
+                 * LF -> CRLF is an expansion, so we work with half buffers, reading
+                 * into the upper half of the buffer and expanding into the full buffer.
+                 * The conversion will never expand to more than the double size.
+                 *
+                 * Note! We do not convert valid CRLF line endings.  This gives us
+                 *       valid DOS text, but no round-trip conversion.
+                 */
+                char * const pchSrc = &buf[sizeof(buf) / 2];
+                while ((nr = read(from_fd, pchSrc, sizeof(buf) / 2)) > 0) {
+                        if (   fPendingCr
+                                && pchSrc[0] != '\n'
+                                && (nw = write(to_fd, "\r", 1))!= 1)
+                                return write_error(ptr_to_fd, to_name, nw);
+
+                        fPendingCr = dos2unix_convert_to_dos(pchSrc, nr, buf, &cchDst);
+
+                        nw = write(to_fd, buf, cchDst);
+                        if (nw != (int)cchDst)
+                                return write_error(ptr_to_fd, to_name, nw);
+                }
+        }
+
+        /* Check for read error. */
+        if (nr != 0)
+                return read_error(from_name, ptr_to_fd, to_name);
+
+        /* When converting, we might have a pending final CR to write. */
+    if (   fPendingCr
+                && (nw = write(to_fd, "\r", 1))!= 1)
+                return write_error(ptr_to_fd, to_name, nw);
+
+    return EX_OK;
 }
 
@@ -1009 +1100 @@
         fprintf(pf,
 "usage: %s [-bCcpSsv] [--[no-]hard-link-files-when-possible]\n"
-"            [--[no-]ignore-perm-errors] [-B suffix] [-f flags]\n"
-"            [-g group] [-m mode] [-o owner] file1 file2\n"
+"            [--[no-]ignore-perm-errors] [-B suffix] [-f flags] [-g group]\n"
+"            [-m mode] [-o owner] [--dos2unix|--unix2dos] file1 file2\n"
 "   or: %s [-bCcpSsv] [--[no-]ignore-perm-errors] [-B suffix] [-f flags]\n"
 "            [-g group] [-m mode] [-o owner] file1 ... fileN directory\n"
@@ -1044 +1135 @@
 }
 
+/**
+ * Checks if @a pszFilename actually needs dos2unix conversion.
+ *
+ * @returns boolean.
+ * @param       pszFilename             The name of the file to check.
+ */
+static KBOOL needs_dos2unix_conversion(const char *pszFilename)
+{
+        KU32 fStyle = 0;
+        int iErr = dos2unix_analyze_file(pszFilename, &fStyle, NULL, NULL);
+        return iErr != 0
+                || (fStyle & (DOS2UNIX_STYLE_MASK | DOS2UNIX_F_BINARY)) != DOS2UNIX_STYLE_UNIX;
+}
+
+/**
+ * Checks if @a pszFilename actually needs unix2dos conversion.
+ *
+ * @returns boolean.
+ * @param       pszFilename             The name of the file to check.
+ */
+static KBOOL needs_unix2dos_conversion(const char *pszFilename)
+{
+        KU32 fStyle = 0;
+        int iErr = dos2unix_analyze_file(pszFilename, &fStyle, NULL, NULL);
+        return iErr != 0
+                || (fStyle & (DOS2UNIX_STYLE_MASK | DOS2UNIX_F_BINARY)) != DOS2UNIX_STYLE_DOS;
+}
+

trunk/src/kmk/main.c

@@ -1414 +1414 @@
 # endif /* !ELECTRIC_HEAP */
 
+# ifdef KMK
+  /* Clear the SEM_NOGPFAULTERRORBOX flag so WER will generate dumps when we run
+     under cygwin.  To void popups, set WER registry value DontShowUI to 1. */
+  if (getenv("KMK_NO_SET_ERROR_MODE") == NULL)
+    SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);
+# endif
+
   /* start off assuming we have no shell */
   unixy_shell = 0;
   no_default_sh_exe = 1;
 #endif
-# ifdef CONFIG_WITH_FAST_IS_SPACE /* bird */
+#ifdef CONFIG_WITH_FAST_IS_SPACE /* bird */
   memset (space_map, '\0', sizeof(space_map));
   set_space_map_entry (' ');
@@ -1426 +1433 @@
   set_space_map_entry ('\t');
   set_space_map_entry ('\v');
-# endif /* CONFIG_WITH_FAST_IS_SPACE */
+#endif /* CONFIG_WITH_FAST_IS_SPACE */
 
 #ifdef CONFIG_WITH_PRINT_TIME_SWITCH

trunk/src/lib/Makefile.kmk

@@ -41 +41 @@
         maybe_con_write.c \
         maybe_con_fwrite.c \
+       dos2unix.c \
         kbuild_version.c
 kUtil_SOURCES.win = \

trunk/src/lib/kDep.c

@@ -69 +69 @@
 /* For the GNU/hurd weirdo. */
 #if !defined(PATH_MAX) && !defined(_MAX_PATH)
-# define PATH_MAX 2048
+# define PATH_MAX 4096
 #endif