From: "Juan Manuel Guerrero" <ST001906 AT HRZ1 DOT HRZ DOT TU-Darmstadt DOT De>
Organization: Darmstadt University of Technology
To: djgpp-workers AT delorie DOT com
Date: Thu, 21 Dec 2000 21:19:49 +0200
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Subject: Re: Patch #4 for dtou and utod
In-reply-to: <39A514185@HRZ1.hrz.tu-darmstadt.de>
X-mailer: Pegasus Mail for Windows (v2.54DE)
Message-ID: <3E4564CB2@HRZ1.hrz.tu-darmstadt.de>
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

Patch 2/2 for version ***using*** getopt().

diff -acprNC5 djgpp.orig/src/utils/utils.tex djgpp/src/utils/utils.tex
*** djgpp.orig/src/utils/utils.tex	Mon Nov 27 13:46:22 2000
--- djgpp/src/utils/utils.tex	Thu Dec 21 19:38:42 2000
*************** so that they won't get mixed with the fi
*** 320,353 ****
  
  @c -----------------------------------------------------------------------------
  @node dtou, utod, djtar, Top
  @chapter dtou
  
! Usage: @code{dtou} [@code{-b}] [@code{-h}] [@code{-r}] [@code{-s}] [@code{-t}]
! [@code{-v}] [@code{-vv}] @file{files}
  
  Each file specified on the command line is converted from dos's CR/LF
  text file mode to unix's NL text file mode.
  
  All djgpp wildcards are supported.  Timestamps of the files are preserved.
  
  @code{dtou} will pass an exit status of 0 to the calling context if all the
  files have been successfully processed and an exit status greater than 0 if
! not.  In this case, the exit status is equal to the amount of unsuccessfully
  processed files.  A file has not been successfully processed if some kind of
  I/O error occurred.
  
  @strong{Options:}
  
  @table @code
  
  @item -b
  
  Creates a backup of the original file if the file has been modified.
  @file{.d2u} is used as backup suffix.  On systems with LFN support, the
  backup suffix will be appended to the file name.  If no LFN support is
  available the backup suffix will overwrite the original file suffix.
  
  @item -h
  
  Displays a help text and exits.
  
--- 320,359 ----
  
  @c -----------------------------------------------------------------------------
  @node dtou, utod, djtar, Top
  @chapter dtou
  
! Usage: @code{dtou} [@code{-b}] [@code{-h} | @code{-?}] [@code{-r}] [@code{-s}] [@code{-t}]
! [@code{-v}] [@code{-v -v}|@code{-vv}] @file{files}
  
  Each file specified on the command line is converted from dos's CR/LF
  text file mode to unix's NL text file mode.
  
  All djgpp wildcards are supported.  Timestamps of the files are preserved.
  
  @code{dtou} will pass an exit status of 0 to the calling context if all the
  files have been successfully processed and an exit status greater than 0 if
! not.  In this case, the exit status will be equal to the amount of unsuccessfully
  processed files.  A file has not been successfully processed if some kind of
  I/O error occurred.
  
+ If a file name starts with a dash, you can place @code{--} in the command line
+ to separate it from the options.  @code{dtou} will stop scanning the command
+ line for options as soon as it finds @code{--} and will treat everything
+ beyond @code{--} as file names.
+ 
  @strong{Options:}
  
  @table @code
  
  @item -b
  
  Creates a backup of the original file if the file has been modified.
  @file{.d2u} is used as backup suffix.  On systems with LFN support, the
  backup suffix will be appended to the file name.  If no LFN support is
  available the backup suffix will overwrite the original file suffix.
+ If an old backup file exists it will be deleted.
  
  @item -h
  
  Displays a help text and exits.
  
*************** Warning: At least one Cntl-Z has been fo
*** 396,413 ****
  Warning: At least one LF without a preceeding CR has been found.
  @end example
  
  Of course, not all of the above lines will appear all together.  The first
  line showing the file name will always be printed.  If the file has not been
! modified at all, then only the next line will be printed.  If the file has
! been modified an appropiate combination of the lines 3 to 6 will be printed,
  indicating what has been modified.  The above output is of some use, e.g.:
  if @code{dtou} reports a LF without a preceeding CR this will be a sure sign
  that the file is either binary or has inconsistent EOL format for some other
  reason.  If @code{dtou} reports that a Cntl-Z (software EOF) has been found,
! then the file will be truncated at that line and the rest of the file will be
! lost.
  
  @end table
  
  The program is backward compatible with previous program versions if no options
  are given at all.  In this case, an occurrence of Cntl-Z will truncate the file,
--- 402,420 ----
  Warning: At least one LF without a preceeding CR has been found.
  @end example
  
  Of course, not all of the above lines will appear all together.  The first
  line showing the file name will always be printed.  If the file has not been
! modified at all, then only the next line will be printed.  This will be the
! case if the file does not contain any CR/LF pair at all.  If the file has been
! modified an appropiate combination of the lines 3 to 6 will be printed,
  indicating what has been modified.  The above output is of some use, e.g.:
  if @code{dtou} reports a LF without a preceeding CR this will be a sure sign
  that the file is either binary or has inconsistent EOL format for some other
  reason.  If @code{dtou} reports that a Cntl-Z (software EOF) has been found,
! then the file will be truncated at that line and the rest of the file contents
! will be lost.
  
  @end table
  
  The program is backward compatible with previous program versions if no options
  are given at all.  In this case, an occurrence of Cntl-Z will truncate the file,
*************** no backup of the original file will be d
*** 417,431 ****
--- 424,503 ----
  
  @c -----------------------------------------------------------------------------
  @node utod, gxx, dtou, Top
  @chapter utod
  
+ Usage: @code{utod} [@code{-b}] [@code{-h} | @code{-?}] [@code{-t}]
+ [@code{-v}] [@code{-v -v}|@code{-vv}] @file{files}
+ 
  Each file specified on the command line is converted from unix's NL text
  file mode to dos's CR/LF text file mode.
  
  All djgpp wildcards are supported.  Timestamps of the files are preserved.
  
+ @code{utod} will pass an exit status of 0 to the calling context if all the
+ files have been successfully processed and an exit status greater than 0 if
+ not.  In this case, the exit status is equal to the amount of unsuccessfully
+ processed files.  A file has not been successfully processed if some kind of
+ I/O error occurred.
+ 
+ If a file name starts with a dash, you can place @code{--} in the command line
+ to separate it from the options.  @code{utod} will stop scanning the command
+ line for options as soon as it finds @code{--} and will treat everything
+ beyond @code{--} as file names.
+ 
+ @strong{Options:}
+ 
+ @table @code
+ 
+ @item -b
+ 
+ Creates a backup of the original file if the file has been modified.
+ @file{.u2d} is used as backup suffix.  On systems with LFN support, the
+ backup suffix will be appended to the file name.  If no LFN support is
+ available the backup suffix will overwrite the original file suffix.
+ If an old backup file exists it will be deleted.
+ 
+ @item -h
+ 
+ Displays a help text and exits.
+ 
+ @item -t
+ 
+ Timestamp.  With this option the timestamp of a modified file will not be
+ preserved.  The timestamp of an unmodified file will always be preserved.
+ 
+ @item -v
+ 
+ Verbose mode.  Prints a single line showing the file name and if file
+ processing has been successful or not.  The only case that a file is
+ considered as unsuccessfully processed is if an I/O error has occurred.
+ 
+ @item -vv
+ 
+ Very verbose mode.  Prints the file name and shows the kind of modifications
+ that have been done to the file.  The possible output looks like:
+ 
+ @example
+ File: foo.c
+ File unchanged.
+ At least one LF to CR/LF transformation occurred.
+ @end example
+ 
+ Of course, not all of the above lines will appear all together.  The first
+ line showing the file name will always be printed.  If the file has not been
+ modified at all, then only the next line will be printed.  This will be the
+ case if the file does not contain any LF at all or if it is already a dos
+ text file.  If the file has been modified line 3 will be printed.
+ 
+ @end table
+ 
+ The program is backward compatible with previous program versions if no options
+ are given at all.  In this case, UNIX-style EOL (LF) are transformed into
+ MSDOS-style EOL (CR/LF), the timestamp will not be alterated and no backup
+ of the original file will be done.
+ 
  @c -----------------------------------------------------------------------------
  @node gxx, redir, utod, Top
  @chapter gxx
  
  This program is exactly like @code{gcc} (in fact, it @i{calls} gcc), except
diff -acprNC5 djgpp.orig/src/utils/utod.c djgpp/src/utils/utod.c
*** djgpp.orig/src/utils/utod.c	Mon Nov 27 13:46:42 2000
--- djgpp/src/utils/utod.c	Thu Dec 21 20:24:36 2000
***************
*** 10,95 ****
  #include <string.h>
  #include <unistd.h>
  #include <utime.h>
  
  #ifndef O_BINARY
! #define O_BINARY 0
  #endif
  
  
  static int
! utod(char *fname)
  {
!   int i, k, sf, df, l, l2=0, err=0, iscr=0;
!   char buf[16384], buf2[32768];
!   char tfname[FILENAME_MAX], *bn, *w;
    struct stat st;
    struct utimbuf tim1;
!   sf = open(fname, O_RDONLY|O_BINARY);
    if (sf < 0)
    {
!     perror(fname);
!     return 1;
    }
  
    fstat (sf,&st);
    tim1.actime = st.st_atime;
    tim1.modtime = st.st_mtime;
  
!   strcpy (tfname, fname);
!   for (bn=w=tfname; *w; w++) 
!     if (*w=='/' || *w=='\\' || *w==':') 
!       bn = w+1;  
!   if (bn) *bn=0;
!   strcat (tfname,"utod.tm$");
!   
!   df = open(tfname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
    if (df < 0)
    {
!     perror(tfname);
!     close(sf);
!     return 1;
    }
  
!   while ((l=read(sf, buf, 16384)) > 0)
    {
!     for (i=k=0; i<l; i++)
      {
!       if (buf[i]==10 && !iscr) buf2[k++]=13;
!       iscr=(buf[i]==13 ? 1 : 0);
!       buf2[k++]=buf[i];
      }
!     l2=write(df, buf2, k);
!     if (l2<0) break;
!     if (l2!=k) { err=1; break; }
    }
  
!   if (l<0) perror (fname);
!   if (l2<0) perror (tfname);
!   if (err) fprintf (stderr,"Cannot process file %s\n",fname);
  
!   close(sf);
!   close(df);
  
!   if (l>=0 && l2>=0 && err==0)
    {
!     remove(fname);
!     rename(tfname, fname);
!     utime(fname, &tim1);
!     chown(fname, st.st_uid, st.st_gid);
!     chmod(fname, st.st_mode);
    }
!   else 
    {
!     remove(tfname);
    }
!   return 0;
  }
  
  int
! main(int argc, char **argv)
  {
!   int rv = 0;
!   for (argc--, argv++; argc; argc--, argv++)
!     rv += utod(*argv);
!   return rv;
  }
--- 10,225 ----
  #include <string.h>
  #include <unistd.h>
  #include <utime.h>
  
  #ifndef O_BINARY
! # define O_BINARY 0
  #endif
  
+ #if defined(MSDOS) || defined(_Windows)
+ # define IS_DIR_SEPARATOR(path) ((path) == '/' || (path) == '\\' || (path) == ':')
+ #else
+ # define IS_DIR_SEPARATOR(path) ((path) == '/')
+ #endif
+ 
+ /* Buffer size. */
+ #define SRCBUF_SIZE     16384    /* Suorce buffer. */
+ #define DESBUF_SIZE     32768    /* Destination buffer. */
+ 
+ /* Control characters. */    
+ #define LF            0x0A
+ #define CR            0x0D
+ 
+ /* Exit codes. */
+ #define NO_ERROR      0x00
+ #define IO_ERROR      0x01  /* Some I/O error occurred. */
+ 
+ 
+ static char *
+ BaseName (char *name)
+ {
+   char *bn, *w;
+   for (bn = w = name; *w; w++)
+     if (IS_DIR_SEPARATOR (*w))
+       bn = w + 1;
+   return bn;
+ }
  
  static int
! dtou (char *fname, int make_backup, int verbosity, int preserve_timestamp)
  {
!   int i, k, sf, df, l, l2 = 0, exit_status = NO_ERROR, file_has_changed = 0, is_CR = 0;
!   char src_buffer[SRCBUF_SIZE], dest_buffer[DESBUF_SIZE];
!   char backup_fname[FILENAME_MAX], temp_fname[FILENAME_MAX], *bn;
    struct stat st;
    struct utimbuf tim1;
! 
!   sf = open (fname, O_RDONLY|O_BINARY);
    if (sf < 0)
    {
!     perror (fname);
!     return IO_ERROR;
    }
  
    fstat (sf,&st);
    tim1.actime = st.st_atime;
    tim1.modtime = st.st_mtime;
  
!   strcpy (temp_fname, fname);
!   bn = BaseName (temp_fname);
!   *bn = 0;
!   strcat (temp_fname, "utod.tm$");
!   if (make_backup)
!   {
!     strcpy (backup_fname, fname);
!     if (pathconf ((backup_fname), _PC_NAME_MAX) <= 12)
!       for (i = strlen (backup_fname); i > -1; i--)
!         if (backup_fname[i] == '.')
!         {
!           backup_fname[i] = '\0';
!           break;
!         }
!     strcat (backup_fname, ".u2d");
!   }
! 
!   df = open (temp_fname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
    if (df < 0)
    {
!     perror (temp_fname);
!     close (sf);
!     return IO_ERROR;
    }
  
!   while ((l = read (sf, src_buffer, SRCBUF_SIZE)) > 0)
    {
!     for (i = k = 0; i < l; i++)
      {
!       if (src_buffer[i] == LF && !is_CR)
!       {
!         dest_buffer[k++] = CR;
!         file_has_changed = 1;
!       }
!       is_CR = (src_buffer[i] == CR ? 1 : 0);
!       dest_buffer[k++] = src_buffer[i];
      }
!     l2 = write (df, dest_buffer, k);
!     if (l2 < 0) break;
!     if (l2 != k) { exit_status = IO_ERROR; break; }
    }
  
!   if (l < 0) perror (fname);
!   if (l2 < 0) perror (temp_fname);
!   if (exit_status != NO_ERROR)
!     fprintf (stderr,"Cannot process file %s\n",fname);
  
!   close (sf);
!   close (df);
  
!   if (l >= 0 && l2 >= 0 && exit_status == NO_ERROR)
    {
!     if (verbosity == 1)
!       printf ("File: %s successfully processed.\n",fname);
!     if (verbosity == 2)
!       printf ("File: %s\n",fname);
! 
!     if ((verbosity == 2) && file_has_changed)
!       printf ("At least one LF to CR/LF transformation occurred.\n");
!     if ((verbosity == 2) && !file_has_changed)
!       printf ("File unchanged.\n");
! 
!     if (make_backup && file_has_changed)
!     {
!       remove (backup_fname);
!       rename (fname, backup_fname);
!     }
!     else
!       remove (fname);
!     rename (temp_fname, fname);
!     chown (fname, st.st_uid, st.st_gid);
!     chmod (fname, st.st_mode);
!     if (preserve_timestamp || !file_has_changed)
!       utime (fname, &tim1);
    }
!   else
    {
!     remove (temp_fname);
!     if (verbosity)
!       printf ("File: %s. An I/O error occurred\n",fname);
    }
! 
!   return exit_status;
! }
! 
! static void
! usage (char *progname)
! {
!   printf ("Usage: %s [options] files...\n\n", progname);
!   printf ("Options are:\n");
!   printf ("            -b:  A backup of the original file is made using `.u2d' as backup\n");
!   printf ("                 extension, if the file has been modified.\n");
!   printf ("      -h or -?:  Display this help and exit.\n");
!   printf ("            -t:  The timestamp of the modified file will not be preserved.\n");
!   printf ("            -v:  Show if file processing has been successful or not.\n");
!   printf ("  -v -v or -vv:  Show the kind of modifications that have been done to the file.\n");
!   printf ("The program is backward compatible with previous program versions if no options\n");
!   printf ("are given at all. In this case, UNIX-style EOL (LF) are transformed into MSDOS-\n");
!   printf ("style EOL (CRLF), the timestamp will not be alterated and no backup file of the\n");
!   printf ("original file will be created.\n");
  }
  
  int
! main (int argc, char **argv)
  {
!   int exit_status = NO_ERROR, make_backup, verbosity, preserve_timestamp;
!   int option;
!   char *progname = BaseName (argv[0]);
! 
!   if (argc < 2)
!   {
!     usage (progname);
!     exit (IO_ERROR);
!   }
! 
!   /* Default for backward compatibility. */
!   make_backup = verbosity = 0;
!   preserve_timestamp = 1;
! 
!   opterr = 0;
!   while ((option = getopt (argc, argv, "?bhtv")) != -1)
!   {
!     switch (option)
!     {
!       case 'b':
!         make_backup = 1;
!         break;
!       case 'h':
!         usage (progname);
!         exit (NO_ERROR);
!         break;
!       case 't':
!         preserve_timestamp = 0;
!         break;
!       case 'v':
!         verbosity++;
!         if (verbosity > 2)
!           verbosity = 2;
!         break;
!       case '?':
!         if (optopt == '?')
!         {
!           usage (progname);
!           exit(NO_ERROR);
!         }
!         else
!         {
!           fprintf (stderr, "%s: invalid option -- %c.\n", progname, optopt);
!           fprintf (stderr, "Try `%s -h' for more information.\n", progname);
!           exit (IO_ERROR);
!         }
!         break;
!     }
!   }
! 
!   for (; optind < argc; optind++)
!     exit_status += dtou (argv[optind], make_backup, verbosity, preserve_timestamp);
!   return exit_status;
  }