Alter HasSuffixC()'s char * to be const.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 7f1bdde70977daf06a3a84df3395d6d7a7372b18..9d73a0945be720c0d80d2d7a961111d28a8872a1 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -2,8 +2,6 @@
 /*
  * annosbr.c -- prepend annotation to messages
  *
 /*
  * annosbr.c -- prepend annotation to messages
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -13,7 +11,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>

-#include <errno.h>

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


@@ -35,15 +32,20 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     int                        i, fd;
     struct utimbuf     b;
     struct stat                s;
     int                        i, fd;
     struct utimbuf     b;
     struct stat                s;

+    int                        failed_to_lock = 0;

 
     /* open and lock the file to be annotated */
 
     /* open and lock the file to be annotated */

-    if ((fd = lkopen (file, O_RDWR, 0)) == NOTOK) {
+    if ((fd = lkopendata (file, O_RDWR, 0, &failed_to_lock)) == NOTOK) {

        switch (errno) {
            case ENOENT:
                break;
 
            default:
        switch (errno) {
            case ENOENT:
                break;
 
            default:

-               admonish (file, "unable to lock and open");
+               if (failed_to_lock) {
+                   admonish (file, "unable to lock");
+               } else {
+                   admonish (file, "unable to open");
+               }

                break;
        }
        return 1;
                break;
        }
        return 1;


@@ -62,7 +64,7 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     if (preserve_actime_and_modtime && utime(file, &b) == -1)
        advise("can't set access and modification times for %s", file);
 
     if (preserve_actime_and_modtime && utime(file, &b) == -1)
        advise("can't set access and modification times for %s", file);
 

-    lkclose (fd, file);
+    lkclosedata (fd, file);

     return i;
 }
 
     return i;
 }
 


@@ -86,7 +88,7 @@ annolist(char *file, char *comp, char *text, int number)
     int                n;              /* number of bytes written */
     char       *sp;            /* another miscellaneous character pointer */
 
     int                n;              /* number of bytes written */
     char       *sp;            /* another miscellaneous character pointer */
 

-    if ((fp = fopen(file, "r")) == (FILE *)0)
+    if ((fp = fopen(file, "r")) == NULL)

        adios(file, "unable to open");
 
     /*
        adios(file, "unable to open");
 
     /*


@@ -115,7 +117,6 @@ annolist(char *file, char *comp, char *text, int number)
        for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
            if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {
                (void)ungetc(c, fp);
        for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
            if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {
                (void)ungetc(c, fp);

-               c = '\n';

                break;
            }
 
                break;
            }
 


@@ -139,7 +140,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 == (char *)0 && (sp = strrchr(cp, '/')) != (char *)0)
+           if (text == NULL && (sp = strrchr(cp, '/')) != (char *)0)

                cp = sp + 1;
 
            (void)printf("%s\n", cp);
                cp = sp + 1;
 
            (void)printf("%s\n", cp);


@@ -185,9 +186,12 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
     int                length;         /* length of field name */
     int                n;              /* number of bytes written */
 
     int                length;         /* length of field name */
     int                n;              /* number of bytes written */
 

-    mode = fstat (fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot ();
+    mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();

 
 

-    strncpy (tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
+    if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
+    strncpy (tmpfil, cp, sizeof(tmpfil));

     chmod (tmpfil, mode);
 
     /*
     chmod (tmpfil, mode);
 
     /*


@@ -199,7 +203,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      */
 
     if (delete >= -1 || append != 0) {
      */
 
     if (delete >= -1 || append != 0) {

-       if ((fp = fdopen(fd, "r")) == (FILE *)0)
+       if ((fp = fdopen(fd, "r")) == NULL)

            adios(NULL, "unable to fdopen file.");
 
        field = (char *)mh_xmalloc(field_size = 256);
            adios(NULL, "unable to fdopen file.");
 
        field = (char *)mh_xmalloc(field_size = 256);


@@ -292,7 +296,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 
            if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
                if (delete == 0) {
 
            if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
                if (delete == 0) {

-                   if (text == (char *)0)
+                   if (text == NULL)

                        break;
 
                    for (cp = field + length + 1; *cp == ' ' || *cp == '\t'; cp++)
                        break;
 
                    for (cp = field + length + 1; *cp == ' ' || *cp == '\t'; cp++)


@@ -303,7 +307,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
                                break;
                    }
                    else {
                                break;
                    }
                    else {

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

                            cp = sp + 1;
 
                        if (strcmp(cp, text) == 0)
                            cp = sp + 1;
 
                        if (strcmp(cp, text) == 0)


@@ -391,10 +395,8 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      * copying routine uses the descriptor, not the pointer.
      */
 
      * copying routine uses the descriptor, not the pointer.
      */
 

-    if (append || delete >= -1) {
-       if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
-           adios(NULL, "can't seek.");
-    }
+    if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
+        adios(NULL, "can't seek.");

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


@@ -415,13 +417,13 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 
        cpydata (tmpfd, fd, tmpfil, file);
        close (tmpfd);
 
        cpydata (tmpfd, fd, tmpfil, file);
        close (tmpfd);

-       unlink (tmpfil);
+       (void) m_unlink (tmpfil);

     } else {
        strncpy (buffer, m_backup (file), sizeof(buffer));
        if (rename (file, buffer) == NOTOK) {
            switch (errno) {
                case ENOENT:    /* unlinked early - no annotations */
     } else {
        strncpy (buffer, m_backup (file), sizeof(buffer));
        if (rename (file, buffer) == NOTOK) {
            switch (errno) {
                case ENOENT:    /* unlinked early - no annotations */

-                   unlink (tmpfil);
+                   (void) m_unlink (tmpfil);

                    break;
 
                default:
                    break;
 
                default:


@@ -442,7 +444,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      * lkclose() fail, but that failure is ignored so it's not a problem.
      */
 
      * lkclose() fail, but that failure is ignored so it's not a problem.
      */
 

-    if (delete >= -1)
+    if (fp)

        (void)fclose(fp);
 
     return 0;
        (void)fclose(fp);
 
     return 0;