projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated test-scan to correspond to commit
[mmh]
/
uip
/
annosbr.c
diff --git
a/uip/annosbr.c
b/uip/annosbr.c
index
6677d21
..
5b9fff4
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.
@@
-11,6
+9,7
@@
#include <h/mh.h>
#include <h/tws.h>
#include <h/mh.h>
#include <h/tws.h>
+#include <h/utils.h>
#include <fcntl.h>
#include <errno.h>
#include <utime.h>
#include <fcntl.h>
#include <errno.h>
#include <utime.h>
@@
-93,8
+92,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.
*/
- if ((field = (char *)malloc(field_size = 256)) == (char *)0)
- adios(NULL, "can't allocate field buffer.");
+ field = (char *)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.
@@
-120,8
+118,7
@@
annolist(char *file, char *comp, char *text, int number)
}
if (++n >= field_size - 1) {
}
if (++n >= field_size - 1) {
- if ((field = (char *)realloc((void *)field, field_size += 256)) == (char *)0)
- adios(NULL, "can't grow field buffer.");
+ field = (char *) mh_xrealloc((void *)field, field_size += 256);
cp = field + n - 1;
}
cp = field + n - 1;
}
@@
-180,20
+177,15
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
FILE *tmp;
int c; /* current character */
int count; /* header field (annotation) counter */
FILE *tmp;
int c; /* current character */
int count; /* header field (annotation) counter */
- char *field; /* buffer for header field */
- int field_size; /* size of field buffer */
- FILE *fp; /* file pointer made from locked file descriptor */
+ char *field = NULL; /* buffer for header field */
+ int field_size = 0; /* size of field buffer */
+ FILE *fp = NULL; /* file pointer made from locked file descriptor */
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_scratch (file, "annotate"), sizeof(tmpfil));
-
- if ((tmp = fopen (tmpfil, "w")) == NULL) {
- admonish (tmpfil, "unable to create");
- return 1;
- }
+ strncpy (tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
chmod (tmpfil, mode);
/*
chmod (tmpfil, mode);
/*
@@
-208,8
+200,7
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
if ((fp = fdopen(fd, "r")) == (FILE *)0)
adios(NULL, "unable to fdopen file.");
if ((fp = fdopen(fd, "r")) == (FILE *)0)
adios(NULL, "unable to fdopen file.");
- if ((field = (char *)malloc(field_size = 256)) == (char *)0)
- adios(NULL, "can't allocate field buffer.");
+ field = (char *)mh_xmalloc(field_size = 256);
}
/*
}
/*
@@
-263,8
+254,7
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
}
if (++n >= field_size - 1) {
}
if (++n >= field_size - 1) {
- if ((field = (char *)realloc((void *)field, field_size *= 2)) == (char *)0)
- adios(NULL, "can't grow field buffer.");
+ field = (char *) mh_xrealloc((void *)field, field_size *= 2);
cp = field + n - 1;
}
cp = field + n - 1;
}
@@
-384,7
+374,7
@@
annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
while (*cp && *cp++ != '\n')
continue;
if (cp - sp)
while (*cp && *cp++ != '\n')
continue;
if (cp - sp)
- fprintf (tmp, "%s: %*.*s", comp, cp - sp, cp - sp, sp);
+ fprintf (tmp, "%s: %*.*s", comp, (int)(cp - sp), (int)(cp - sp), sp);
} while (*cp);
if (cp[-1] != '\n' && cp != text)
putc ('\n', tmp);
} while (*cp);
if (cp[-1] != '\n' && cp != text)
putc ('\n', tmp);