X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;h=33d2b49dec03d53c781946c15098b9f92a219862;hp=b1d866785536936a6a913baedcde5e1d6642c905;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3 diff --git a/uip/anno.c b/uip/anno.c index b1d8667..33d2b49 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -5,38 +5,10 @@ ** COPYRIGHT file in the root directory of the nmh distribution for ** complete copyright information. ** -** Three new options have been added: delete, list, and number. -** Message header fields are used by the new MIME attachment code in -** the send command. Adding features to generalize the anno command -** seemed to be a better approach than the creation of a new command -** whose features would overlap with those of the anno command. -** -** The -delete option deletes header elements that match the -component -** field name. If -delete is used without the -text option, the first -** header field whose field name matches the component name is deleted. -** If the -delete is used with the -text option, and the -text argument -** begins with a /, the first header field whose field name matches the -** component name and whose field body matches the text is deleted. If -** the -text argument does not begin with a /, then the text is assumed -** to be the last component of a path name, and the first header field -** whose field name matches the component name and a field body whose -** last path name component matches the text is deleted. If the -delete -** option is used with the new -number option described below, the nth -** header field whose field name matches the component name is deleted. -** No header fields are deleted if none of the above conditions are met. -** -** The -list option outputs the field bodies from each header field whose -** field name matches the component name, one per line. If no -text -** option is specified, only the last path name component of each field -** body is output. The entire field body is output if the -text option -** is used; the contents of the -text argument are ignored. If the -list -** option is used in conjuction with the new -number option described -** below, each line is numbered starting with 1. A tab separates the -** number from the field body. -** -** The -number option works with both the -delete and -list options as -** described above. The -number option takes an optional argument. A -** value of 1 is assumed if this argument is absent. +** Three new options have been added: delete, list, and number. Adding +** features to generalize the anno command seemed to be a better approach +** than the creation of a new command whose features would overlap with +** those of the anno command. */ #include @@ -45,7 +17,13 @@ #include #include #include +#include +#include +#include +#include +#include +static enum { MODE_ADD, MODE_DEL, MODE_LIST } mode = MODE_ADD; static struct swit switches[] = { #define COMPSW 0 @@ -53,35 +31,38 @@ static struct swit switches[] = { #define DATESW 1 { "date", 0 }, #define NDATESW 2 - { "nodate", 0 }, + { "nodate", 2 }, #define TEXTSW 3 { "text body", 0 }, #define VERSIONSW 4 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 5 { "help", 0 }, #define LISTSW 6 - { "list", 1 }, + { "list", 0 }, #define DELETESW 7 - { "delete", 2 }, + { "delete", 0 }, #define NUMBERSW 8 - { "number", 2 }, + { "number", 0 }, #define APPENDSW 9 - { "append", 1 }, + { "append", 0 }, #define PRESERVESW 10 - { "preserve", 1 }, + { "preserve", 0 }, #define NOPRESERVESW 11 - { "nopreserve", 3 }, + { "nopreserve", 2 }, { NULL, 0 } }; +char *version=VERSION; + /* ** 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); +static int annotate(char *, unsigned char *, char *, int, int, int, int); +static void annolist(char *, unsigned char *, int); +static void dodel(int, unsigned char *, char *, FILE *, int); +static void doadd(int, unsigned char *, char *, FILE *, int, int); int @@ -98,17 +79,10 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; int append = 0; /* append annotations instead of default prepend */ - int delete = -2; /* delete header element if set */ - int list = 0; /* list header elements if set */ int number = 0; /* delete specific number of like elements if set */ - int havemsgs = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); - - /* read user profile/context */ context_read(); arguments = getarguments(invo_name, argc, argv, 1); @@ -119,71 +93,77 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); + + case DELETESW: /* delete annotations */ + mode = MODE_DEL; + continue; + + case LISTSW: /* produce a listing */ + mode = MODE_LIST; + continue; case COMPSW: if (comp) - adios(NULL, "only one component at a time!"); + adios(EX_USAGE, NULL, "only one component at a time!"); if (!(comp = *argp++) || *comp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; - case DATESW: - datesw++; - continue; - case NDATESW: - datesw = 0; - continue; - case TEXTSW: if (text) - adios(NULL, "only one body at a time!"); + adios(EX_USAGE, NULL, "only one body at a time!"); if (!(text = *argp++) || *text == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; - case DELETESW: /* delete annotations */ - delete = 0; - continue; - - case LISTSW: /* produce a listing */ - list = 1; - continue; - case NUMBERSW: /* number listing or delete by number */ - if (number != 0) - adios(NULL, "only one number at a time!"); - - if (argp-arguments == argc-1 || **argp == '-') + if (mode == MODE_ADD) { + adios(EX_USAGE, NULL, "-number switch must appear after -list or -delete, only."); + } + if (mode == MODE_LIST) { number = 1; - - else { - if (strcmp(*argp, "all") == 0) - number = -1; - else if (!(number = atoi(*argp))) - /* FIXME: fails for - ** `-list -number l:10' - ** but okay if we add `all'. - */ - adios(NULL, "missing argument to %s", argp[-1]); + continue; + } + /* MODE_DEL */ + if (number) { + adios(EX_USAGE, NULL, "only one number at a time!"); + } + if (*argp && strcmp(*argp, "all")==0) { + number = -1; argp++; + continue; + } + if (!*argp || !(number = atoi(*argp))) { + adios(EX_USAGE, NULL, "missing argument to %s", + argp[-1]); } + if (number < 0) { + adios(EX_USAGE, NULL, "invalid number (%d).", + number); + } + argp++; + continue; - delete = number; + case DATESW: + datesw++; + continue; + case NDATESW: + datesw = 0; continue; case APPENDSW: @@ -201,32 +181,35 @@ main(int argc, char **argv) } if (*cp == '+' || *cp == '@') { if (folder) - adios(NULL, "only one folder at a time!"); + adios(EX_USAGE, NULL, "only one folder at a time!"); else - folder = getcpy(expandfol(cp)); + folder = mh_xstrdup(expandfol(cp)); } else if (*cp == '/' || *cp == '.') { if (file) - adios(NULL, "only one file at a time!"); + adios(EX_USAGE, NULL, "only one file at a time!"); file = cp; } else { app_msgarg(&msgs, cp); - havemsgs = 1; } } - if (file && (folder || havemsgs)) { - adios(NULL, "Don't intermix files and messages."); + if (file && (folder || msgs.size)) { + adios(EX_USAGE, NULL, "Don't intermix files and messages."); + } + if (!datesw && !text) { + adios(EX_USAGE, NULL, "-nodate without -text is a no-op."); + } + if (number && text) { + adios(EX_USAGE, NULL, "Don't combine -number with -text."); } - - make_comp(&comp); if (file) { - if (list) - annolist(file, comp, text, number); + if (mode == MODE_LIST) + annolist(file, comp, number); else - annotate(file, comp, text, - datesw, delete, append, preserve); - done(0); + annotate(file, comp, text, datesw, number, + append, preserve); + exit(EX_OK); } if (!msgs.size) @@ -236,29 +219,31 @@ main(int argc, char **argv) maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + adios(EX_OSERR, maildir, "unable to change directory to"); /* read folder and create message structure */ if (!(mp = folder_read(folder))) - adios(NULL, "unable to read folder %s", folder); + adios(EX_IOERR, NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + adios(EX_DATAERR, NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ - for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert(mp, msgs.msgs[msgnum])) - done(1); + for (msgnum = 0; msgnum < msgs.size; msgnum++) { + if (!m_convert(mp, msgs.msgs[msgnum])) { + exit(EX_SOFTWARE); + } + } /* annotate all the SELECTED messages */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { - if (list) - annolist(m_name(msgnum), comp, text, number); + if (mode == MODE_LIST) + annolist(m_name(msgnum), comp, number); else annotate(m_name(msgnum), comp, text, datesw, - delete, append, preserve); + number, append, preserve); } } @@ -267,105 +252,65 @@ main(int argc, char **argv) seq_save(mp); folder_free(mp); context_save(); - done(0); - return 1; + return 0; } static void make_comp(unsigned char **ap) { - register unsigned char *cp; + unsigned char *cp; char buffer[BUFSIZ]; - if (*ap == NULL) { + if (!*ap) { printf("Enter component name: "); fflush(stdout); - if (fgets(buffer, sizeof buffer, stdin) == NULL) - done(1); + if (!fgets(buffer, sizeof buffer, stdin)) { + exit(EX_IOERR); + } *ap = trimcpy(buffer); } if ((cp = *ap + strlen(*ap) - 1) > *ap && *cp == ':') - *cp = 0; + *cp = '\0'; if (strlen(*ap) == 0) - adios(NULL, "null component name"); + adios(EX_SOFTWARE, NULL, "null component name"); if (**ap == '-') - adios(NULL, "invalid component name %s", *ap); + adios(EX_CONFIG, NULL, "invalid component name %s", *ap); if (strlen(*ap) >= NAMESZ) - adios(NULL, "too large component name %s", *ap); + adios(EX_SOFTWARE, NULL, "too large component name %s", *ap); for (cp = *ap; *cp; cp++) if (!isalnum(*cp) && *cp != '-') - adios(NULL, "invalid component name %s", *ap); + adios(EX_CONFIG, 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. +** name matches comp. Number the listing if number is set. */ static void -annolist(char *file, char *comp, char *text, int number) +annolist(char *file, unsigned char *comp, int number) { int c; - int count; /* header field (annotation) counter */ + int count = 1; /* 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"); + adios(EX_IOERR, file, "unable to open"); } /* We'll grow this buffer as needed. */ - field = (char *)mh_xmalloc(field_size = 256); + field = mh_xcalloc(field_size = 256, sizeof(char)); + make_comp(&comp); length = strlen(comp); /* Convenience copy. */ - count = 0; do { /* @@ -382,8 +327,7 @@ annolist(char *file, char *comp, char *text, int number) break; } if (++n >= field_size - 1) { - field = (char *)mh_xrealloc(field, - field_size += 256); + field = mh_xrealloc(field, field_size += 256); cp = field + n - 1; } } @@ -391,49 +335,119 @@ annolist(char *file, char *comp, char *text, int number) if (strncasecmp(field, comp, length)==0 && field[length] == ':') { - for (cp = field + length + 1; - *cp == ' ' || *cp == '\t'; cp++) { - continue; - } + cp = trim(field + length + 1); if (number) { - printf("%d\t", ++count); - } - if (!text && (sp = strrchr(cp, '/'))) { - cp = sp + 1; + printf("%d\t", count++); } printf("%s\n", cp); } } while (*field && *field != '-'); - free(field); + mh_free0(&field); fclose(fp); return; } + static int -annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, - int append) +annotate(char *file, unsigned char *comp, char *text, int datesw, + int number, int append, int preserve) { - int mode, tmpfd; - char *cp, *sp; + int fd; + struct utimbuf b; + int perms, tmpfd; 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 ? (int)(st.st_mode & 0777) : m_gmprot(); + /* 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, &st) == -1) { + advise("can't get access and modification times for %s", file); + preserve = 0; + } + b.actime = st.st_atime; + b.modtime = st.st_mtime; + + perms = fstat(fd, &st) != NOTOK ? + (int)(st.st_mode & 0777) : m_gmprot(); strncpy(tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil)); - chmod(tmpfil, mode); + chmod(tmpfil, perms); + + make_comp(&comp); + + if (mode == MODE_DEL) { + dodel(fd, comp, text, tmp, number); + } + if (mode == MODE_ADD) { + doadd(fd, comp, text, tmp, datesw, append); + } + + cpydata(fd, fileno(tmp), file, tmpfil); + fclose(tmp); + + if ((tmpfd = open(tmpfil, O_RDONLY)) == NOTOK) { + adios(EX_IOERR, 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 (mode == MODE_DEL && ftruncate(fd, 0) == -1) { + adios(EX_IOERR, tmpfil, "unable to truncate."); + } + cpydata(tmpfd, fd, tmpfil, file); + close(tmpfd); + unlink(tmpfil); + + if (preserve && utime(file, &b) == -1) { + advise("can't set access and modification times for %s", file); + } + lkclose(fd, file); + return 0; +} + +/* +** We're trying to delete a header field (annotation). +** +** - If number is greater than zero, +** we're deleting the nth header field that matches +** the field (component) name. +** - If number is zero and text is NULL, +** we're deleting the first field in which the field name +** matches the component name. +** - If number is zero and text is set, +** we're deleting the first field in which both the field name +** matches the component name and the field body matches the text. +** - If number is -1, +** we delete all matching fields. +*/ +static void +dodel(int fd, unsigned char *comp, char *text, FILE *tmp, int number) +{ + int length = strlen(comp); /* convenience copy */ + int count = 1; /* Number of matching header line. */ + int c, n; + char *cp; + char *field = NULL; + int field_size = 256; + FILE *fp; /* ** We're going to need to copy some of the message file to the @@ -443,187 +457,175 @@ annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, ** 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); + if ((fp = fdopen(fd, "r")) == NULL) { + adios(EX_IOERR, NULL, "unable to fdopen file."); } + field = mh_xcalloc(field_size, sizeof(char)); /* - ** 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. + ** 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. */ - if (delete >= -1) { - length = strlen(comp); /* convenience copy */ - count = 0; /* Only used if we're deleting by number. */ - + do { /* - ** 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. + ** 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. */ - 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; - } + 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; - } + if (++n >= field_size - 1) { + field = mh_xrealloc(field, field_size *= 2); + cp = field + n - 1; } - *cp = '\0'; + } + *cp = '\0'; + if (strncasecmp(field, comp, length)==0 && + field[length] == ':') { /* - ** 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. + ** This component matches and thus is a candidate. + ** We delete the line by not copying it to the + ** temporary file. Thus: + ** - Break if we've found the one to delete. + ** - Continue if this is one to delete, but + ** there'll be further ones. */ - 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; - } + + if (!number && !text) { + /* this first one is it */ + break; } + if (number == -1) { + /* delete all of them */ + continue; + } else if (number == count++) { + /* delete this specific one */ + break; + } + + if (text) { + /* delete the first matching one */ + cp = field+length+1; + while (*cp==' ' || *cp=='\t') { + cp++; /* eat leading whitespace */ + } + if (*text == '/' && strcmp(text, cp)==0) { + break; /* full path matches */ + } else if (strcmp(text, mhbasename(cp))==0) { + break; /* basename matches */ + } + } /* - ** This line wasn't a match so copy it to the - ** temporary file. + ** Although the compoment name mached, it + ** wasn't the right one. */ - 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 { + /* Copy it. */ + if ((n = fputs(field, tmp)) == EOF || + (c=='\n' && fputc('\n', tmp)==EOF)) { + adios(EX_CANTCREAT, NULL, "unable to write temporary file."); + } + + } while (*field && *field != '-'); + + mh_free0(&field); + + fflush(tmp); + fflush(fp); /* The underlying fd will be closed by lkclose() */ + + /* + ** 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 (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1) { + adios(EX_IOERR, NULL, "can't seek."); + } +} + + +static void +doadd(int fd, unsigned char *comp, char *text, FILE *tmp, int datesw, + int append) +{ + char *cp, *sp; + int c; + FILE *fp = NULL; + + if (append) { /* - ** 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. + ** 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 (append) { + if ((fp = fdopen(fd, "r")) == NULL) { + adios(EX_IOERR, NULL, "unable to fdopen file."); + } + /* Find the end of the headers. */ + if ((c = getc(fp)) == '\n') { + /* Special check for no headers is needed. */ + rewind(fp); + } else { /* - ** Copy lines from the input file to the temporary - ** file until we reach the end of the headers. + ** 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); - while ((c = getc(fp)) != EOF) { - putc(c, tmp); - if (c == '\n') { - ungetc(c = getc(fp), fp); - if (c == '\n' || c == '-') { - break; - } + 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); + if (datesw) { + fprintf(tmp, "%s: %s\n", comp, dtimenow()); + } + if ((cp = text)) { + /* Add body text header */ + 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); @@ -634,38 +636,9 @@ annosbr(int fd, char *file, char *comp, char *text, int datesw, int delete, ** because the stock data copying routine uses the descriptor, ** not the pointer. */ - if (append || delete >= -1) { + if (append) { if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1) { - adios(NULL, "can't seek."); + adios(EX_IOERR, 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; }