From 9e6d91313f01c96b4058d6bf419a8ca9a207bc33 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Fri, 23 Mar 2012 16:17:43 +0100 Subject: [PATCH] Merged annosbr.c into anno.c, as it is no longer used be the other tools. --- h/prototypes.h | 3 - uip/Makefile.in | 6 +- uip/anno.c | 378 +++++++++++++++++++++++++++++++++++++++++++++++++++++ uip/annosbr.c | 390 ------------------------------------------------------- 4 files changed, 381 insertions(+), 396 deletions(-) delete mode 100644 uip/annosbr.c diff --git a/h/prototypes.h b/h/prototypes.h index 61e2c49..0f61ce4 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -133,9 +133,6 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /* ** prototypes for some routines in uip */ -int annotate(char *, char *, char *, int, int, int, int); -void annolist(char *, char *, char *, int); -void annopreserve(int); int distout(char *, char *, char *); int what_now(char *, int, int, char *, char *, int, struct msgs *, char *, char *); diff --git a/uip/Makefile.in b/uip/Makefile.in index 7d4f422..e592a25 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -63,7 +63,7 @@ MISC = ap dp fmtdump mhtest SCMDS = inc # source files -SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \ +SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \ conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \ folder.c forw.c inc.c mmh.sh mark.c md5.c mhbuild.c \ mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \ @@ -93,8 +93,8 @@ ali: ali.o aliasbr.o $(LOCALLIBS) ap: ap.o $(LOCALLIBS) $(LINK) ap.o $(LINKLIBS) -anno: anno.o annosbr.o $(LOCALLIBS) - $(LINK) anno.o annosbr.o $(LINKLIBS) +anno: anno.o $(LOCALLIBS) + $(LINK) anno.o $(LINKLIBS) burst: burst.o $(LOCALLIBS) $(LINK) burst.o $(LINKLIBS) diff --git a/uip/anno.c b/uip/anno.c index 1512823..d03c99c 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -41,6 +41,11 @@ #include #include +#include +#include +#include +#include + static struct swit switches[] = { #define COMPSW 0 @@ -74,6 +79,9 @@ static struct swit switches[] = { ** static prototypes */ static void make_comp(unsigned char **); +static int annosbr(int, char *, char *, char *, int, int, int); +static int annotate(char *, char *, char *, int, int, int, int); +static void annolist(char *, char *, char *, int); int @@ -291,3 +299,373 @@ make_comp(unsigned char **ap) if (!isalnum(*cp) && *cp != '-') adios(NULL, "invalid component name %s", *ap); } + + +static int +annotate(char *file, char *comp, char *text, int datesw, + int delete, int append, int preserve) +{ + 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) { + switch (errno) { + case ENOENT: + break; + default: + admonish(file, "unable to lock and open"); + break; + } + return 1; + } + + if (stat(file, &s) == -1) { + advise("can't get access and modification times for %s", file); + preserve = 0; + } + + b.actime = s.st_atime; + b.modtime = s.st_mtime; + + i = annosbr(fd, file, comp, text, datesw, delete, append); + + if (preserve && utime(file, &b) == -1) { + advise("can't set access and modification times for %s", file); + } + lkclose(fd, file); + return i; +} + +/* +** Produce a listing of all header fields (annotations) whose field +** name matches comp. Number the listing if number is set. Treat the +** field bodies as path names and just output the last component unless +** text is non-NULL. We don't care what text is set to. +*/ +static void +annolist(char *file, char *comp, char *text, int number) +{ + int c; + int count; /* header field (annotation) counter */ + char *cp; + char *field; + int field_size; + FILE *fp; + int length; + int n; /* number of bytes written */ + char *sp; + + if ((fp = fopen(file, "r")) == NULL) { + adios(file, "unable to open"); + } + + /* We'll grow this buffer as needed. */ + field = (char *)mh_xmalloc(field_size = 256); + + length = strlen(comp); /* Convenience copy. */ + count = 0; + + do { + /* + ** Get a line from the input file, growing the field buffer + ** as needed. We do this so that we can fit an entire line + ** in the buffer making it easy to do a string comparison + ** on both the field name and the field body which might be + ** a long path name. + */ + for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) { + if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') { + ungetc(c, fp); + c = '\n'; + break; + } + if (++n >= field_size - 1) { + field = (char *)mh_xrealloc(field, + field_size += 256); + cp = field + n - 1; + } + } + *cp = '\0'; + + if (strncasecmp(field, comp, length)==0 && + field[length] == ':') { + for (cp = field + length + 1; + *cp == ' ' || *cp == '\t'; cp++) { + continue; + } + if (number) { + printf("%d\t", ++count); + } + if (!text && (sp = strrchr(cp, '/'))) { + cp = sp + 1; + } + printf("%s\n", cp); + } + + } while (*field && *field != '-'); + + free(field); + fclose(fp); + + return; +} + +static int +annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, + int append) +{ + int mode, tmpfd; + char *cp, *sp; + char tmpfil[BUFSIZ]; + struct stat st; + FILE *tmp; + int c; + int count; /* header field (annotation) counter */ + char *field = NULL; + int field_size = 0; + FILE *fp = NULL; + int length; + int n; /* number of bytes written */ + + mode = fstat(fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot(); + + strncpy(tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), + sizeof(tmpfil)); + chmod(tmpfil, mode); + + /* + ** We're going to need to copy some of the message file to the + ** temporary file while examining the contents. Convert the + ** message file descriptor to a file pointer since it's a lot + ** easier and more efficient to use stdio for this. Also allocate + ** a buffer to hold the header components as they're read in. + ** This buffer is grown as needed later. + */ + if (delete >= -1 || append != 0) { + if ((fp = fdopen(fd, "r")) == NULL) { + adios(NULL, "unable to fdopen file."); + } + field = (char *)mh_xmalloc(field_size = 256); + } + + /* + ** We're trying to delete a header field (annotation) if the + ** delete flag is greater -2. 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. + ** The text is matched in its entirety if it begins with a slash; + ** otherwise the text is matched against whatever portion of the + ** field body follows 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. A value of -1 means to delete all + ** matching fields. + */ + if (delete >= -1) { + length = strlen(comp); /* convenience copy */ + count = 0; /* Only used if we're deleting by number. */ + + /* + ** Copy lines from the input file to the temporary file + ** until we either find the one that we're looking + ** for (which we don't copy) or we reach the end of + ** the headers. Both a blank line and a line beginning + ** with a - terminate the headers so that we can handle + ** both drafts and RFC-2822 format messages. + */ + do { + /* + ** Get a line from the input file, growing the + ** field buffer as needed. We do this so that + ** we can fit an entire line in the buffer making + ** it easy to do a string comparison on both the + ** field name and the field body which might be + ** a long path name. + */ + for (n=0, cp=field; (c=getc(fp)) != EOF; *cp++ = c) { + if (c == '\n' && (c = getc(fp)) != ' ' && + c != '\t') { + ungetc(c, fp); + c = '\n'; + break; + } + + if (++n >= field_size - 1) { + field = (char *) mh_xrealloc(field, + field_size *= 2); + cp = field + n - 1; + } + } + *cp = '\0'; + + /* + ** Check for a match on the field name. We delete + ** the line by not copying it to the temporary + ** file if + ** + ** o The delete flag is 0, meaning that we're + ** going to delete the first matching + ** field, and the text is NULL meaning that + ** we don't care about the field body. + ** + ** o The delete flag is 0, meaning that we're + ** going to delete the first matching + ** field, and the text begins with a / meaning + ** that we're looking for a full path name, + ** and the text matches the field body. + ** + ** o The delete flag is 0, meaning that we're + ** going to delete the first matching + ** 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 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] == ':') { + if (!delete) { + if (!text) { + break; + } + for (cp=field+length+1; + *cp==' ' || *cp=='\t'; + cp++) { + continue; + } + if (*text == '/' && + strcmp(cp, text)==0) { + break; + } else { + if ((sp = strrchr(cp, '/'))) { + cp = sp + 1; + } + if (strcmp(cp, text)==0) { + break; + } + } + } else if (delete == -1) { + continue; + } else if (++count == delete) { + break; + } + } + + /* + ** This line wasn't a match so copy it to the + ** temporary file. + */ + if ((n = fputs(field, tmp)) == EOF || + (c=='\n' && fputc('\n', tmp)==EOF)) { + adios(NULL, "unable to write temporary file."); + } + } while (*field && *field != '-'); + free(field); + + } else { + /* + ** Find the end of the headers before adding the + ** annotations if we're appending instead of the default + ** prepending. A special check for no headers is needed + ** if appending. + */ + if (append) { + /* + ** Copy lines from the input file to the temporary + ** file until we reach the end of the headers. + */ + if ((c = getc(fp)) == '\n') { + rewind(fp); + } else { + putc(c, tmp); + while ((c = getc(fp)) != EOF) { + putc(c, tmp); + if (c == '\n') { + ungetc(c = getc(fp), fp); + if (c == '\n' || c == '-') { + break; + } + } + } + } + } + + if (datesw) { + fprintf(tmp, "%s: %s\n", comp, dtimenow(0)); + } + if ((cp = text)) { + do { + while (*cp == ' ' || *cp == '\t') { + cp++; + } + sp = cp; + while (*cp && *cp++ != '\n') { + continue; + } + if (cp - sp) { + fprintf(tmp, "%s: %*.*s", comp, + (int)(cp - sp), + (int)(cp - sp), sp); + } + } while (*cp); + if (cp[-1] != '\n' && cp != text) { + putc('\n', tmp); + } + } + } + fflush(tmp); + + /* + ** We've been messing with the input file position. Move the + ** input file descriptor to the current place in the file + ** because the stock data 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."); + } + } + + cpydata(fd, fileno(tmp), file, tmpfil); + fclose(tmp); + + if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK) { + adios(tmpfil, "unable to open for re-reading"); + } + lseek(fd, (off_t) 0, SEEK_SET); + + /* + ** We're making the file shorter if we're deleting a header field + ** so the file has to be truncated or it will contain garbage. + */ + if (delete >= -1 && ftruncate(fd, 0) == -1) { + adios(tmpfil, "unable to truncate."); + } + cpydata(tmpfd, fd, tmpfil, file); + close(tmpfd); + unlink(tmpfil); + + /* + ** Close the delete file so that we don't run out of file pointers if + ** we're doing piles of files. Note that this will make the close() in + ** lkclose() fail, but that failure is ignored so it's not a problem. + */ + if (delete >= -1) { + fclose(fp); + } + return 0; +} diff --git a/uip/annosbr.c b/uip/annosbr.c deleted file mode 100644 index 170d76b..0000000 --- a/uip/annosbr.c +++ /dev/null @@ -1,390 +0,0 @@ -/* -** annosbr.c -- prepend annotation to messages -** -** 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. -*/ - -#include -#include -#include -#include -#include -#include - - -/* -** static prototypes -*/ -static int annosbr(int, char *, char *, char *, int, int, int); - - -int -annotate(char *file, char *comp, char *text, int datesw, - int delete, int append, int preserve) -{ - 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) { - switch (errno) { - case ENOENT: - break; - default: - admonish(file, "unable to lock and open"); - break; - } - return 1; - } - - if (stat(file, &s) == -1) { - advise("can't get access and modification times for %s", file); - preserve = 0; - } - - b.actime = s.st_atime; - b.modtime = s.st_mtime; - - i = annosbr(fd, file, comp, text, datesw, delete, append); - - if (preserve && utime(file, &b) == -1) { - advise("can't set access and modification times for %s", file); - } - lkclose(fd, file); - return i; -} - -/* -** Produce a listing of all header fields (annotations) whose field -** name matches comp. Number the listing if number is set. Treat the -** field bodies as path names and just output the last component unless -** text is non-NULL. We don't care what text is set to. -*/ -void -annolist(char *file, char *comp, char *text, int number) -{ - int c; - int count; /* header field (annotation) counter */ - char *cp; - char *field; - int field_size; - FILE *fp; - int length; - int n; /* number of bytes written */ - char *sp; - - if ((fp = fopen(file, "r")) == NULL) { - adios(file, "unable to open"); - } - - /* We'll grow this buffer as needed. */ - field = (char *)mh_xmalloc(field_size = 256); - - length = strlen(comp); /* Convenience copy. */ - count = 0; - - do { - /* - ** Get a line from the input file, growing the field buffer - ** as needed. We do this so that we can fit an entire line - ** in the buffer making it easy to do a string comparison - ** on both the field name and the field body which might be - ** a long path name. - */ - for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) { - if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') { - ungetc(c, fp); - c = '\n'; - break; - } - if (++n >= field_size - 1) { - field = (char *)mh_xrealloc(field, - field_size += 256); - cp = field + n - 1; - } - } - *cp = '\0'; - - if (strncasecmp(field, comp, length)==0 && - field[length] == ':') { - for (cp = field + length + 1; - *cp == ' ' || *cp == '\t'; cp++) { - continue; - } - if (number) { - printf("%d\t", ++count); - } - if (!text && (sp = strrchr(cp, '/'))) { - cp = sp + 1; - } - printf("%s\n", cp); - } - - } while (*field && *field != '-'); - - free(field); - fclose(fp); - - return; -} - -static int -annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, - int append) -{ - int mode, tmpfd; - char *cp, *sp; - char tmpfil[BUFSIZ]; - struct stat st; - FILE *tmp; - int c; - int count; /* header field (annotation) counter */ - char *field = NULL; - int field_size = 0; - FILE *fp = NULL; - int length; - int n; /* number of bytes written */ - - mode = fstat(fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot(); - - strncpy(tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), - sizeof(tmpfil)); - chmod(tmpfil, mode); - - /* - ** We're going to need to copy some of the message file to the - ** temporary file while examining the contents. Convert the - ** message file descriptor to a file pointer since it's a lot - ** easier and more efficient to use stdio for this. Also allocate - ** a buffer to hold the header components as they're read in. - ** This buffer is grown as needed later. - */ - if (delete >= -1 || append != 0) { - if ((fp = fdopen(fd, "r")) == NULL) { - adios(NULL, "unable to fdopen file."); - } - field = (char *)mh_xmalloc(field_size = 256); - } - - /* - ** We're trying to delete a header field (annotation) if the - ** delete flag is greater -2. 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. - ** The text is matched in its entirety if it begins with a slash; - ** otherwise the text is matched against whatever portion of the - ** field body follows 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. A value of -1 means to delete all - ** matching fields. - */ - if (delete >= -1) { - length = strlen(comp); /* convenience copy */ - count = 0; /* Only used if we're deleting by number. */ - - /* - ** Copy lines from the input file to the temporary file - ** until we either find the one that we're looking - ** for (which we don't copy) or we reach the end of - ** the headers. Both a blank line and a line beginning - ** with a - terminate the headers so that we can handle - ** both drafts and RFC-2822 format messages. - */ - do { - /* - ** Get a line from the input file, growing the - ** field buffer as needed. We do this so that - ** we can fit an entire line in the buffer making - ** it easy to do a string comparison on both the - ** field name and the field body which might be - ** a long path name. - */ - for (n=0, cp=field; (c=getc(fp)) != EOF; *cp++ = c) { - if (c == '\n' && (c = getc(fp)) != ' ' && - c != '\t') { - ungetc(c, fp); - c = '\n'; - break; - } - - if (++n >= field_size - 1) { - field = (char *) mh_xrealloc(field, - field_size *= 2); - cp = field + n - 1; - } - } - *cp = '\0'; - - /* - ** Check for a match on the field name. We delete - ** the line by not copying it to the temporary - ** file if - ** - ** o The delete flag is 0, meaning that we're - ** going to delete the first matching - ** field, and the text is NULL meaning that - ** we don't care about the field body. - ** - ** o The delete flag is 0, meaning that we're - ** going to delete the first matching - ** field, and the text begins with a / meaning - ** that we're looking for a full path name, - ** and the text matches the field body. - ** - ** o The delete flag is 0, meaning that we're - ** going to delete the first matching - ** 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 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] == ':') { - if (!delete) { - if (!text) { - break; - } - for (cp=field+length+1; - *cp==' ' || *cp=='\t'; - cp++) { - continue; - } - if (*text == '/' && - strcmp(cp, text)==0) { - break; - } else { - if ((sp = strrchr(cp, '/'))) { - cp = sp + 1; - } - if (strcmp(cp, text)==0) { - break; - } - } - } else if (delete == -1) { - continue; - } else if (++count == delete) { - break; - } - } - - /* - ** This line wasn't a match so copy it to the - ** temporary file. - */ - if ((n = fputs(field, tmp)) == EOF || - (c=='\n' && fputc('\n', tmp)==EOF)) { - adios(NULL, "unable to write temporary file."); - } - } while (*field && *field != '-'); - free(field); - - } else { - /* - ** Find the end of the headers before adding the - ** annotations if we're appending instead of the default - ** prepending. A special check for no headers is needed - ** if appending. - */ - if (append) { - /* - ** Copy lines from the input file to the temporary - ** file until we reach the end of the headers. - */ - if ((c = getc(fp)) == '\n') { - rewind(fp); - } else { - putc(c, tmp); - while ((c = getc(fp)) != EOF) { - putc(c, tmp); - if (c == '\n') { - ungetc(c = getc(fp), fp); - if (c == '\n' || c == '-') { - break; - } - } - } - } - } - - if (datesw) { - fprintf(tmp, "%s: %s\n", comp, dtimenow(0)); - } - if ((cp = text)) { - do { - while (*cp == ' ' || *cp == '\t') { - cp++; - } - sp = cp; - while (*cp && *cp++ != '\n') { - continue; - } - if (cp - sp) { - fprintf(tmp, "%s: %*.*s", comp, - (int)(cp - sp), - (int)(cp - sp), sp); - } - } while (*cp); - if (cp[-1] != '\n' && cp != text) { - putc('\n', tmp); - } - } - } - fflush(tmp); - - /* - ** We've been messing with the input file position. Move the - ** input file descriptor to the current place in the file - ** because the stock data 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."); - } - } - - cpydata(fd, fileno(tmp), file, tmpfil); - fclose(tmp); - - if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK) { - adios(tmpfil, "unable to open for re-reading"); - } - lseek(fd, (off_t) 0, SEEK_SET); - - /* - ** We're making the file shorter if we're deleting a header field - ** so the file has to be truncated or it will contain garbage. - */ - if (delete >= -1 && ftruncate(fd, 0) == -1) { - adios(tmpfil, "unable to truncate."); - } - cpydata(tmpfd, fd, tmpfil, file); - close(tmpfd); - unlink(tmpfil); - - /* - ** Close the delete file so that we don't run out of file pointers if - ** we're doing piles of files. Note that this will make the close() in - ** lkclose() fail, but that failure is ignored so it's not a problem. - */ - if (delete >= -1) { - fclose(fp); - } - return 0; -} -- 1.7.10.4