X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fannosbr.c;h=e8ef50ae209afa87e36002fbdd3879be3fba38f4;hp=41b0cc295d9ac2f974d66a580d0cf85df9993e71;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=7480dbc14bc90f2d872d434205c0784704213252 diff --git a/uip/annosbr.c b/uip/annosbr.c index 41b0cc2..e8ef50a 100644 --- a/uip/annosbr.c +++ b/uip/annosbr.c @@ -11,21 +11,30 @@ #include #include +#include #include #include +#include -extern int errno; /* * static prototypes */ static int annosbr (int, char *, char *, char *, int, int, int, int); +/* + * This "local" global and the annopreserve() function are a hack that allows additional + * functionality to be added to anno without piling on yet another annotate() argument. + */ + +static int preserve_actime_and_modtime = 0; /* set to preserve access and modification times on annotated message */ int annotate (char *file, char *comp, char *text, int inplace, int datesw, int delete, int append) { - int i, fd; + int i, fd; + struct utimbuf b; + struct stat s; /* open and lock the file to be annotated */ if ((fd = lkopen (file, O_RDWR, 0)) == NOTOK) { @@ -40,7 +49,19 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet return 1; } + if (stat(file, &s) == -1) { + advise("can't get access and modification times for %s", file); + preserve_actime_and_modtime = 0; + } + + b.actime = s.st_atime; + b.modtime = s.st_mtime; + i = annosbr (fd, file, comp, text, inplace, datesw, delete, append); + + if (preserve_actime_and_modtime && utime(file, &b) == -1) + advise("can't set access and modification times for %s", file); + lkclose (fd, file); return i; } @@ -73,8 +94,7 @@ annolist(char *file, char *comp, char *text, int number) * 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. @@ -100,8 +120,7 @@ annolist(char *file, char *comp, char *text, int number) } 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; } @@ -139,6 +158,16 @@ annolist(char *file, char *comp, char *text, int number) return; } +/* + * Set the preserve-times flag. This hack eliminates the need for an additional argument to annotate(). + */ + +void +annopreserve(int preserve) +{ + preserve_actime_and_modtime = preserve; + return; +} static int annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, int delete, int append) @@ -174,17 +203,16 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * as they're read in. This buffer is grown as needed later. */ - if (delete >= 0 || append != 0) { + if (delete >= -1 || append != 0) { 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); } /* * We're trying to delete a header field (annotation )if the delete flag is - * non-negative. A value greater than zero means that we're deleting the + * not -2 or less. A value greater than zero means that we're deleting the * nth header field that matches the field (component) name. A value of * zero means that we're deleting the first field in which both the field * name matches the component name and the field body matches the text. @@ -193,10 +221,10 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * the last slash. This allows matching of both absolute and relative path * names. This is because this functionality was added to support attachments. * It might be worth having a separate flag to indicate path name matching to - * make it more general. + * make it more general. A value of -1 means to delete all matching fields. */ - if (delete >= 0) { + if (delete >= -1) { /* * Get the length of the field name since we use it often. */ @@ -233,9 +261,8 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in } 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; } } @@ -261,8 +288,11 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * field, the text does not begin with a / meaning that we're looking for the * last path name component, and the last path name component matches the text. * - * o The delete flag is non-zero meaning that we're going to delete the nth field + * o The delete flag is positive meaning that we're going to delete the nth field * with a matching field name, and this is the nth matching field name. + * + * o The delete flag is -1 meaning that we're going to delete all fields with a + * matching field name. */ if (strncasecmp(field, comp, length) == 0 && field[length] == ':') { @@ -286,6 +316,9 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in } } + else if (delete == -1) + continue; + else if (++count == delete) break; } @@ -309,7 +342,8 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in else { /* * Find the end of the headers before adding the annotations if we're - * appending instead of the default prepending. + * appending instead of the default prepending. A special check for + * no headers is needed if appending. */ if (append) { @@ -318,14 +352,21 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * reach the end of the headers. */ - while ((c = getc(fp)) != EOF) { - (void)putc(c, tmp); + if ((c = getc(fp)) == '\n') + rewind(fp); - if (c == '\n') { - (void)ungetc(c = getc(fp), fp); + else { + (void)putc(c, tmp); - if (c == '\n' || c == '-') - break; + while ((c = getc(fp)) != EOF) { + (void)putc(c, tmp); + + if (c == '\n') { + (void)ungetc(c = getc(fp), fp); + + if (c == '\n' || c == '-') + break; + } } } } @@ -340,7 +381,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in 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); @@ -355,7 +396,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * copying routine uses the descriptor, not the pointer. */ - if (append || delete >= 0) { + if (append || delete >= -1) { if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1) adios(NULL, "can't seek."); } @@ -374,7 +415,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in * so the file has to be truncated or it will contain garbage. */ - if (delete >= 0 && ftruncate(fd, 0) == -1) + if (delete >= -1 && ftruncate(fd, 0) == -1) adios(tmpfil, "unable to truncate."); cpydata (tmpfd, fd, tmpfil, file); @@ -406,7 +447,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. */ - if (delete >= 0) + if (delete >= -1) (void)fclose(fp); return 0;