Commit ddf3a8574f65 is a fix to commit af586ebe59b7.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 124c77e7e979eaca6d0b7e744f004b94dd2a1c98..8b0c8843e23e4db585e9ad3ca8d13801ac4d581d 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -5,11 +5,17 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "annosbr.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/cpydata.h"
+#include "sbr/m_backup.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 #include <utime.h>
 
 #include <fcntl.h>
 #include <utime.h>
 


@@ -53,7 +59,7 @@ annotate (char *file, char *comp, char *text, bool inplace, bool datesw, int del
 
     if (stat(file, &s) == -1) {
         inform("can't get access and modification times for %s", file);
 
     if (stat(file, &s) == -1) {
         inform("can't get access and modification times for %s", file);

-       preserve_actime_and_modtime = 0;
+       preserve_actime_and_modtime = 0;

     }
 
     b.actime = s.st_atime;
     }
 
     b.actime = s.st_atime;


@@ -96,7 +102,7 @@ annolist(char *file, char *comp, char *text, int number)
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 

-    field = (char *)mh_xmalloc(field_size = 256);
+    field = mh_xmalloc(field_size = 256);

 
     /*
      *  Get the length of the field name since we use it often.
 
     /*
      *  Get the length of the field name since we use it often.


@@ -121,7 +127,7 @@ annolist(char *file, char *comp, char *text, int number)
            }
 
            if (++n >= field_size - 1) {
            }
 
            if (++n >= field_size - 1) {

-               field = (char *) mh_xrealloc((void *)field, field_size += 256);
+               field = mh_xrealloc((void *)field, field_size += 256);

                
                cp = field + n - 1;
            }
                
                cp = field + n - 1;
            }


@@ -140,7 +146,7 @@ annolist(char *file, char *comp, char *text, int number)
            if (number)
                (void)printf("%d\t", ++count);
 
            if (number)
                (void)printf("%d\t", ++count);
 

-           if (text == NULL && (sp = strrchr(cp, '/')) != (char *)0)
+           if (text == NULL && (sp = strrchr(cp, '/')))

                cp = sp + 1;
 
             puts(cp);
                cp = sp + 1;
 
             puts(cp);


@@ -186,7 +192,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {

-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file");

     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);


@@ -201,9 +207,9 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
 
     if (delete >= -1 || append) {
        if ((fp = fdopen(fd, "r")) == NULL)
 
     if (delete >= -1 || append) {
        if ((fp = fdopen(fd, "r")) == NULL)

-           adios(NULL, "unable to fdopen file.");
+           die("unable to fdopen file.");

 
 

-       field = (char *)mh_xmalloc(field_size = 256);
+       field = mh_xmalloc(field_size = 256);

     }
 
     /*
     }
 
     /*


@@ -257,7 +263,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
                }
 
                if (++n >= field_size - 1) {
                }
 
                if (++n >= field_size - 1) {

-                   field = (char *) mh_xrealloc((void *)field, field_size *= 2);
+                   field = mh_xrealloc((void *)field, field_size *= 2);

                
                    cp = field + n - 1;
                }
                
                    cp = field + n - 1;
                }


@@ -324,7 +330,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))

-               adios(NULL, "unable to write temporary file.");
+               die("unable to write temporary file.");

 
        } while (*field != '\0' && *field != '-');
 
 
        } while (*field != '\0' && *field != '-');
 


@@ -332,7 +338,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
         *  Get rid of the field buffer because we're done with it.
         */
 
         *  Get rid of the field buffer because we're done with it.
         */
 

-       free((void *)field);
+       free(field);

     }
 
     else {
     }
 
     else {


@@ -393,7 +399,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)

-        adios(NULL, "can't seek.");
+        die("can't seek.");

 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);
 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);