projects
/
mmh
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19b66d5
)
spost: Refactor braces, comments, etc.
author
markus schnalke
<meillo@marmaro.de>
Wed, 29 Apr 2015 05:03:09 +0000
(07:03 +0200)
committer
markus schnalke
<meillo@marmaro.de>
Wed, 29 Apr 2015 05:03:09 +0000
(07:03 +0200)
uip/spost.c
patch
|
blob
|
history
diff --git
a/uip/spost.c
b/uip/spost.c
index
48f9797
..
b5fac12
100644
(file)
--- a/
uip/spost.c
+++ b/
uip/spost.c
@@
-183,17
+183,20
@@
main(int argc, char **argv)
continue;
}
}
continue;
}
}
- if (msg)
+ if (msg) {
adios(EX_USAGE, NULL, "only one message at a time!");
adios(EX_USAGE, NULL, "only one message at a time!");
- else
+ } else {
msg = cp;
msg = cp;
+ }
}
}
- if (!msg)
+ if (!msg) {
adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name);
adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name);
+ }
- if ((in = fopen(msg, "r")) == NULL)
+ if ((in = fopen(msg, "r")) == NULL) {
adios(EX_IOERR, msg, "unable to open");
adios(EX_IOERR, msg, "unable to open");
+ }
if (debug) {
verbose++;
if (debug) {
verbose++;
@@
-325,12
+328,17
@@
putfmt(char *name, char *str, FILE *out)
if ((i = get_header(name, hdrtab)) == NOTOK) {
/* no header we would care for */
if ((i = get_header(name, hdrtab)) == NOTOK) {
/* no header we would care for */
- if (mh_strcasecmp(name, attach_hdr)!=0 &&
- mh_strcasecmp(name, sign_hdr)!=0 &&
- mh_strcasecmp(name, enc_hdr)!=0) {
- /* push it through */
- fprintf(out, "%s: %s", name, str);
+ if (mh_strcasecmp(name, attach_hdr)==0) {
+ return;
}
}
+ if (mh_strcasecmp(name, sign_hdr)==0) {
+ return;
+ }
+ if (mh_strcasecmp(name, enc_hdr)==0) {
+ return;
+ }
+ /* push it through */
+ fprintf(out, "%s: %s", name, str);
return;
}
/* it's one of the interesting headers */
return;
}
/* it's one of the interesting headers */
@@
-413,10
+421,9
@@
putfmt(char *name, char *str, FILE *out)
*/
if (hdr->set & MFRM) {
*/
if (hdr->set & MFRM) {
-
struct mailname *mp = NULL;
struct mailname *mp = NULL;
- /* This is need because the addresse parser hold global state */
+ /* needed because the address parser holds global state */
ismymbox(NULL);
while ((cp = getname(str)) != NULL) {
ismymbox(NULL);
while ((cp = getname(str)) != NULL) {
@@
-493,7
+500,6
@@
get_header(char *header, struct headers *table)
return (h - table);
}
}
return (h - table);
}
}
-
return NOTOK;
}
return NOTOK;
}
@@
-524,7
+530,7
@@
putadr(char *name, struct mailname *nl)
/* a local name - see if it's an alias */
cp = akvalue(mp->m_mbox);
if (cp == mp->m_mbox) {
/* a local name - see if it's an alias */
cp = akvalue(mp->m_mbox);
if (cp == mp->m_mbox) {
- /* wasn't an alias - use what the user typed */
+ /* wasn't an alias - use it unchanged */
linepos = putone(mp->m_text, linepos, namelen);
} else {
/* an alias - expand it */
linepos = putone(mp->m_text, linepos, namelen);
} else {
/* an alias - expand it */
@@
-546,7
+552,7
@@
putadr(char *name, struct mailname *nl)
}
}
} else {
}
}
} else {
- /* not a local name - use what the user typed */
+ /* not a local name - use it unchanged */
linepos = putone(mp->m_text, linepos, namelen);
}
mp2 = mp;
linepos = putone(mp->m_text, linepos, namelen);
}
mp2 = mp;
@@
-559,13
+565,13
@@
putadr(char *name, struct mailname *nl)
static int
putone(char *adr, int pos, int indent)
{
static int
putone(char *adr, int pos, int indent)
{
- register int len;
+ int len;
static int linepos;
len = strlen(adr);
static int linepos;
len = strlen(adr);
- if (pos == indent)
+ if (pos == indent) {
linepos = pos;
linepos = pos;
- else if (linepos+len > OUTPUTLINELEN) {
+ } else if (linepos+len > OUTPUTLINELEN) {
fprintf(out, ",\n%*s", indent, "");
linepos = indent;
pos += indent + 2;
fprintf(out, ",\n%*s", indent, "");
linepos = indent;
pos += indent + 2;