X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ef02b5cfad61304c9745f112a9a5b76f12b6c1ed..44ce2010:/uip/sendsbr.c?ds=sidebyside diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 74f7dae5..2de5c90f 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -1,6 +1,4 @@ - -/* - * sendsbr.c -- routines to help WhatNow/Send along +/* sendsbr.c -- routines to help WhatNow/Send along * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -191,7 +189,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, int compnum, nparts, partno, state, status; long pos, start; time_t clock; - char *cp, *dp, buffer[BUFSIZ], msgid[BUFSIZ]; + char *cp, *dp, buffer[NMH_BUFSIZ], msgid[BUFSIZ]; char subject[BUFSIZ]; char name[NAMESZ], partnum[BUFSIZ]; FILE *in; @@ -286,7 +284,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, nparts = 1; pos = start; - while (fgets (buffer, sizeof(buffer) - 1, in)) { + while (fgets (buffer, sizeof buffer, in)) { long len; if ((pos += (len = strlen (buffer))) > CPERMSG) { @@ -298,8 +296,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, /* Only one part, nothing to split */ if (nparts == 1) { free (cp); - if (dp) - free (dp); + mh_xfree(dp); fclose (in); return sendaux (vec, vecp, program, drft, st); @@ -357,7 +354,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, for (;;) { long len; - if (!fgets (buffer, sizeof(buffer) - 1, in)) { + if (!fgets (buffer, sizeof buffer, in)) { if (partno == nparts) break; adios (NULL, "premature eof"); @@ -377,7 +374,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, fclose (out); if (!pushsw && verbsw) { - printf ("\n"); + putchar('\n'); fflush (stdout); } @@ -405,8 +402,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, } free (cp); - if (dp) - free (dp); + mh_xfree(dp); fclose (in); /* close the draft */ return status; @@ -434,8 +430,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) snprintf (buf, sizeof(buf), "%d", fd2); vec[vecp++] = buf; } else { - admonish (NULL, "unable to create temporary file in %s " - "for annotation list", get_temp_dir()); + inform("unable to create temporary file in %s for " + "annotation list, continuing...", get_temp_dir()); } } vec[vecp++] = drft; @@ -456,7 +452,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) /* * child process -- send it * - * If fd is ok, then we are pushing and fd points to temp + * If fd is OK, then we are pushing and fd points to temp * file, so capture anything on stdout and stderr there. */ if (fd != NOTOK) { @@ -486,7 +482,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) alert (drft, fd); close (fd); } else { - advise (NULL, "message not delivered to anyone"); + inform("message not delivered to anyone"); } if (annotext && fd2 != NOTOK) close (fd2); @@ -524,6 +520,7 @@ alert (char *file, int out) case NOTOK: /* oops -- fork error */ advise ("fork", "unable to"); + /* FALLTHRU */ case OK: /* child process -- send it */ @@ -588,7 +585,7 @@ tmp_fd (void) if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK; if (debugsw) - advise (NULL, "temporary file %s selected", tfile); + inform("temporary file %s selected", tfile); else if (m_unlink (tfile) == NOTOK) advise (tfile, "unable to remove"); @@ -611,7 +608,7 @@ anno (int fd, struct stat *st) || st->st_dev != st2.st_dev || st->st_ino != st2.st_ino)) { if (debugsw) - admonish (NULL, "$mhaltmsg mismatch"); + inform("$mhaltmsg mismatch, continuing..."); return; } @@ -619,10 +616,10 @@ anno (int fd, struct stat *st) switch (child_id) { case NOTOK: /* oops */ if (!debugsw) - advise (NULL, - "unable to fork, so doing annotations by hand..."); + inform("unable to fork, so doing annotations by hand..."); if (cwd == NULL) - cwd = getcpy (pwd ()); + cwd = mh_xstrdup(pwd ()); + /* FALLTHRU */ case OK: /* block a few signals */ @@ -665,7 +662,7 @@ annoaux (int fd) if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) { if (debugsw) - admonish (NULL, "$mhfolder not set"); + inform("$mhfolder not set, continuing..."); return; } maildir = m_maildir (folder); @@ -676,20 +673,20 @@ annoaux (int fd) } if (!(mp = folder_read (folder, 0))) { if (debugsw) - admonish (NULL, "unable to read folder %s", folder); + inform("unable to read folder %s, continuing...", folder); return; } /* check for empty folder */ if (mp->nummsg == 0) { if (debugsw) - admonish (NULL, "no messages in %s", folder); + inform("no messages in %s, continuing...", folder); goto oops; } if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) { if (debugsw) - admonish (NULL, "$mhmessages not set"); + inform("$mhmessages not set, continuing..."); goto oops; } if (!debugsw /* MOBY HACK... */ @@ -701,21 +698,21 @@ annoaux (int fd) } else fd2 = NOTOK; - for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++) + for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++) m_convert (mp, *ap); free (cp); if (fd2 != NOTOK) dup2 (fd2, fileno (stderr)); if (mp->numsel == 0) { if (debugsw) - admonish (NULL, "no messages to annotate"); + inform("no messages to annotate, continuing..."); goto oops; } lseek (fd, (off_t) 0, SEEK_SET); if ((fp = fdopen (fd, "r")) == NULL) { if (debugsw) - admonish (NULL, "unable to fdopen annotation list"); + inform("unable to fdopen annotation list, continuing..."); goto oops; } cp = NULL; @@ -724,12 +721,12 @@ annoaux (int fd) fclose (fp); if (debugsw) - advise (NULL, "annotate%s with %s: \"%s\"", + inform("annotate%s with %s: \"%s\"", inplace ? " inplace" : "", annotext, cp); for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { if (debugsw) - advise (NULL, "annotate message %d", msgnum); + inform("annotate message %d", msgnum); annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0); } } @@ -822,21 +819,21 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc, adios(NULL, "Unable to retrieve oauth profile entries: %s", errbuf); - vec[(*vecp)++] = getcpy("-authservice"); - vec[(*vecp)++] = getcpy(auth_svc); - vec[(*vecp)++] = getcpy("-oauthcredfile"); - vec[(*vecp)++] = getcpy(mh_oauth_cred_fn(auth_svc)); - vec[(*vecp)++] = getcpy("-oauthclientid"); + vec[(*vecp)++] = mh_xstrdup("-authservice"); + vec[(*vecp)++] = mh_xstrdup(auth_svc); + vec[(*vecp)++] = mh_xstrdup("-oauthcredfile"); + vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc)); + vec[(*vecp)++] = mh_xstrdup("-oauthclientid"); vec[(*vecp)++] = getcpy(svc.client_id); - vec[(*vecp)++] = getcpy("-oauthclientsecret"); + vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret"); vec[(*vecp)++] = getcpy(svc.client_secret); - vec[(*vecp)++] = getcpy("-oauthauthendpoint"); + vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint"); vec[(*vecp)++] = getcpy(svc.auth_endpoint); - vec[(*vecp)++] = getcpy("-oauthredirect"); + vec[(*vecp)++] = mh_xstrdup("-oauthredirect"); vec[(*vecp)++] = getcpy(svc.redirect_uri); - vec[(*vecp)++] = getcpy("-oauthtokenendpoint"); + vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint"); vec[(*vecp)++] = getcpy(svc.token_endpoint); - vec[(*vecp)++] = getcpy("-oauthscope"); + vec[(*vecp)++] = mh_xstrdup("-oauthscope"); vec[(*vecp)++] = getcpy(svc.scope); } } @@ -867,7 +864,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host, char *hostformat = "%(host{Envelope-From})"; if ((*addr = get_message_header_info (in, addrformat)) == NULL || - strlen (*addr) == 0) { + !**addr) { addrformat = distfile == NULL ? "%(addr{Sender})" : "%(addr{Resent-Sender})"; hostformat = distfile == NULL ? "%(host{Sender})" : "%(host{Resent-Sender})"; @@ -893,10 +890,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host, fclose(in); return OK; - } else { - *message = "unable to open"; - return NOTOK; } + + *message = "unable to open"; + return NOTOK; } @@ -963,12 +960,11 @@ get_message_header_info(FILE *in, char *format) { /* Trim trailing newline, if any. */ retval = rtrim(charstring_buffer_copy((buffer))); charstring_free(buffer); - if (strlen (retval) > 0) { + if (*retval) return retval; - } else { - free (retval); - return NULL; - } + + free(retval); + return NULL; } @@ -998,7 +994,7 @@ merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) } /* Use argsplit() to do the real work of splitting the args in the profile entry. */ - if (profile_entry && strlen(profile_entry) > 0) { + if (profile_entry && *profile_entry) { int profile_vecp; char *file; char **profile_vec = argsplit(profile_entry, &file, &profile_vecp);