projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put in a prototype for client() to get rid of the "default prototype" warning.
[mmh]
/
uip
/
post.c
diff --git
a/uip/post.c
b/uip/post.c
index
4602dc0
..
a1cc05f
100644
(file)
--- a/
uip/post.c
+++ b/
uip/post.c
@@
-20,6
+20,17
@@
#include <setjmp.h>
#include <signal.h>
#include <setjmp.h>
#include <signal.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#ifdef MMDFMTS
# include <mts/mmdf/util.h>
# include <mts/mmdf/mmdf.h>
#ifdef MMDFMTS
# include <mts/mmdf/util.h>
# include <mts/mmdf/mmdf.h>
@@
-632,7
+643,7
@@
main (int argc, char **argv)
if (verbose)
printf (partno ? "Partial Message #%s Processed\n" : "Message Processed\n",
partno);
if (verbose)
printf (partno ? "Partial Message #%s Processed\n" : "Message Processed\n",
partno);
- done (0);
+ return done (0);
}
}
@@
-690,7
+701,7
@@
putfmt (char *name, char *str, FILE *out)
if ((cp = strrchr(str, '\n')))
*cp = 0;
if ((cp = strrchr(str, '\n')))
*cp = 0;
- for (cp = pp = str; cp = strchr(pp, ','); pp = cp) {
+ for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
*cp++ = 0;
insert_fcc (hdr, pp);
}
*cp++ = 0;
insert_fcc (hdr, pp);
}
@@
-704,7
+715,7
@@
putfmt (char *name, char *str, FILE *out)
}
tmpaddrs.m_next = NULL;
}
tmpaddrs.m_next = NULL;
- for (count = 0; cp = getname (str); count++)
+ for (count = 0; (cp = getname (str)); count++)
if ((mp = getm (cp, NULL, 0, AD_HOST, NULL))) {
if (tmpaddrs.m_next)
np->m_next = mp;
if ((mp = getm (cp, NULL, 0, AD_HOST, NULL))) {
if (tmpaddrs.m_next)
np->m_next = mp;
@@
-844,7
+855,7
@@
finish_headers (FILE *out)
fprintf (out, "Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Message-ID: <%d.%ld@%s>\n",
fprintf (out, "Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Message-ID: <%d.%ld@%s>\n",
- (int) getpid (), tclock, LocalName ());
+ (int) getpid (), (long) tclock, LocalName ());
if (msgflags & MFRM)
fprintf (out, "Sender: %s\n", from);
else
if (msgflags & MFRM)
fprintf (out, "Sender: %s\n", from);
else
@@
-875,7
+886,7
@@
finish_headers (FILE *out)
fprintf (out, "Resent-Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Resent-Message-ID: <%d.%ld@%s>\n",
fprintf (out, "Resent-Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Resent-Message-ID: <%d.%ld@%s>\n",
- (int) getpid (), tclock, LocalName ());
+ (int) getpid (), (long) tclock, LocalName ());
if (msgflags & MRFM)
fprintf (out, "Resent-Sender: %s\n", from);
else
if (msgflags & MRFM)
fprintf (out, "Resent-Sender: %s\n", from);
else
@@
-916,7
+927,7
@@
putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag
if (mp->m_mbox == NULL || ((flags & HTRY) && !insert (mp)))
return 0;
if (mp->m_mbox == NULL || ((flags & HTRY) && !insert (mp)))
return 0;
- if (!fill_in && (flags & (HBCC | HDCC)) || mp->m_ingrp)
+ if ((!fill_in && (flags & (HBCC | HDCC))) || mp->m_ingrp)
return 1;
if (!nameoutput) {
return 1;
if (!nameoutput) {
@@
-938,13
+949,14
@@
putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag
}
len = strlen (cp);
}
len = strlen (cp);
- if (linepos != nameoutput)
+ if (linepos != nameoutput) {
if (len + linepos + 2 > outputlinelen)
fprintf (out, ",\n%*s", linepos = nameoutput, "");
else {
fputs (", ", out);
linepos += 2;
}
if (len + linepos + 2 > outputlinelen)
fprintf (out, ",\n%*s", linepos = nameoutput, "");
else {
fputs (", ", out);
linepos += 2;
}
+ }
fputs (cp, out);
linepos += len;
fputs (cp, out);
linepos += len;
@@
-972,7
+984,7
@@
putgrp (char *name, char *group, FILE *out, unsigned int flags)
cp = fill_in ? group : concat (group, ";", NULL);
len = strlen (cp);
cp = fill_in ? group : concat (group, ";", NULL);
len = strlen (cp);
- if (linepos > nameoutput)
+ if (linepos > nameoutput) {
if (len + linepos + 2 > outputlinelen) {
fprintf (out, ",\n%*s", nameoutput, "");
linepos = nameoutput;
if (len + linepos + 2 > outputlinelen) {
fprintf (out, ",\n%*s", nameoutput, "");
linepos = nameoutput;
@@
-981,6
+993,7
@@
putgrp (char *name, char *group, FILE *out, unsigned int flags)
fputs (", ", out);
linepos += 2;
}
fputs (", ", out);
linepos += 2;
}
+ }
fputs (cp, out);
linepos += len;
fputs (cp, out);
linepos += len;
@@
-1118,7
+1131,7
@@
make_bcc_file (int dashstuff)
fprintf (out, "Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Message-ID: <%d.%ld@%s>\n",
fprintf (out, "Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Message-ID: <%d.%ld@%s>\n",
- (int) getpid (), tclock, LocalName ());
+ (int) getpid (), (long) tclock, LocalName ());
fprintf (out, "From: %s\n", signature);
if (subject)
fprintf (out, "Subject: %s", subject);
fprintf (out, "From: %s\n", signature);
if (subject)
fprintf (out, "Subject: %s", subject);