Mercurial > hg > Applications > mh
changeset 16:07f8972434be
fix for Yosemita Clang
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 12 Nov 2014 02:46:27 +0900 |
| parents | 1891194b739c |
| children | 76d91e545ea8 |
| files | conf/config/mts.c config/config.c postcnv sbr/Makefile sbr/addrsbr.c sbr/path.c uip/Makefile uip/ali.c uip/aliasbr.c uip/bbc.c uip/burst.c uip/conflict.c uip/folder.c uip/forw.c uip/mhlsbr.c uip/mhn.c uip/msh.c uip/mshcmds.c uip/post.c uip/rcvtty.c uip/replsbr.c uip/scan.c uip/sendsbr.c uip/slocal.c uip/spost.c uip/trmsbr.c uip/whatnowsbr.c zotnet/mts/lock.c zotnet/mts/mts.c zotnet/tws/dtimep.c |
| diffstat | 30 files changed, 310 insertions(+), 181 deletions(-) [+] |
line wrap: on
line diff
--- a/conf/config/mts.c Thu May 03 17:09:32 2012 +0900 +++ b/conf/config/mts.c Wed Nov 12 02:46:27 2014 +0900 @@ -25,7 +25,10 @@ #include <sys/utsname.h> #endif /* SYS5 */ #endif /* NETWORK */ +#include <netdb.h> #include <pwd.h> +#include <unistd.h> + #define NOTOK (-1) @@ -253,6 +256,7 @@ /* ARGSUSED */ +void mts_init (name) char *name; { @@ -392,7 +396,7 @@ #ifndef BIND sethostent (1); #endif - if (hp = mh_gethostbyname (buffer)) + if ((hp = mh_gethostbyname (buffer))) (void) strcpy (buffer, hp -> h_name); #endif /* BSD42 or SOCKETS */ #else /* not NETWORK */
--- a/config/config.c Thu May 03 17:09:32 2012 +0900 +++ b/config/config.c Wed Nov 12 02:46:27 2014 +0900 @@ -12,6 +12,8 @@ #include <pwd.h> #endif /* MHRC */ #include <stdio.h> +#include <unistd.h> + #if defined(__STDC__) @@ -58,12 +60,12 @@ #ifdef MHRC case '~': - if (cp = index (pp = file + 1, '/')) + if ((cp = index (pp = file + 1, '/'))) *cp++ = '\0'; if (*pp == '\0') pp = mypath; else - if (pw = getpwnam (pp)) + if ((pw = getpwnam (pp))) pp = pw -> pw_dir; else { if (cp)
--- a/postcnv Thu May 03 17:09:32 2012 +0900 +++ b/postcnv Wed Nov 12 02:46:27 2014 +0900 @@ -1,8 +1,25 @@ #!/usr/bin/perl -@A = (); -$i = 0; -$tmp = "/tmp/postaa$$"; +my @A = (); +my $i = 0; +my $tmp = "/tmp/postaa$$"; +my $host = "yourhost.cr.ie.u-ryukyu.ac.jp"; +my $f; +my $file; +my @U; +my $debug = 0; + +if ($debug) { + open(LOG,">>/tmp/postcnv.log"); +} + +sub mysystem { + my ($arg) = @_; + print LOG "$arg\n" if ($debug); + system $arg; +} + +# system "echo @ARGV >> /tmp/ahoaho"; # /usr/local/mh/lib/post [-alias aliasfile] # [-filter filterfile] [-nofilter] [-format] [-noformat] @@ -18,21 +35,39 @@ } elsif( /^-filter/ ) { push(@A,$_); $_ = shift(@ARGV); push(@A,$_); } elsif( /^-idanno/ ) { - push(@A,$_); $_ = shift(@ARGV); push(@A,$_); + shift(@ARGV); + # push(@A,$_); $_ = shift(@ARGV); push(@A,$_); } elsif( /^-library/ ) { push(@A,$_); $_ = shift(@ARGV); push(@A,$_); } elsif( /^-width/ ) { push(@A,$_); $_ = shift(@ARGV); push(@A,$_); } elsif( /^-/ ) { - push(@A,$_); + push(@A,$_); } else { $f = $tmp . $i++; - system("nkf -j -m0 < $_ > $f"); - push(@A,$f); push(@U,$f); + $file = $_; + push(@A,$f); # push(@U,$_); } } -system "/usr/local/lib/mh/post @A"; +# system "refile -link -src +drafts last +send"; +# print STDERR "/bin/cp $f $new\n"; +if ($file) { + my $new = `/usr/local/mh/bin/mhpath +send new`; + # system("nkf -j -m0 --overwrite $file"); too late? + mysystem("/bin/cp $file $new"); + mysystem("scp $file ${host}:${f}"); +} -unlink(@U); +# system "echo remote @A >> /tmp/ahoaho"; +# how to handle error? +mysystem("ssh $host /usr/local/mh/lib/post @A"); +if (! $debug) { + mysystem("ssh $host rm $f"); +} + +# unlink(@U); +1; + +#end
--- a/sbr/Makefile Thu May 03 17:09:32 2012 +0900 +++ b/sbr/Makefile Wed Nov 12 02:46:27 2014 +0900 @@ -5,10 +5,11 @@ # @(#)$Id: Makefile,v 1.2 2005/04/19 15:25:08 kono Exp $ ############################################################################## -OPTIONS = -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/less"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O2 -g +OPT= -g -Wparentheses -Wimplicit-function-declaration -Wimplicit-int +OPTIONS = -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/less"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void $(OPT) -CC = gcc -CPP = gcc -E +CC = clang +CPP = clang -E CFLAGS = $(OPTIONS) LINT = lint LFLAGS = -bhu $(OPTIONS)
--- a/sbr/addrsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/sbr/addrsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -445,7 +445,7 @@ mp -> m_host = getcpy (host); } else { - if (pp = index (mbox, '!')) { + if ((pp = index (mbox, '!'))) { *pp++ = '\0'; mp -> m_mbox = getcpy (pp); mp -> m_host = getcpy (mbox); @@ -581,10 +581,14 @@ #endif /* DUMB */ #ifndef BANG - if (mp -> m_type != UUCPHOST) - (void) sprintf (addr, mp -> m_host ? "%s%s@%s" : "%s%s", - mp -> m_path ? mp -> m_path : "", mp -> m_mbox, mp -> m_host); - else + if (mp -> m_type != UUCPHOST) { + if (mp->m_host) + (void) sprintf (addr, "%s%s@%s" , + mp -> m_path , mp -> m_mbox, mp -> m_host); + else + (void) sprintf (addr, "%s%s", + "", mp -> m_mbox); + } else #endif /* not BANG */ (void) sprintf (addr, "%s!%s", mp -> m_host, mp -> m_mbox); @@ -683,7 +687,7 @@ else { mp = &mq; oops = 0; - while (cp = getname (am)) + while ((cp = getname (am))) if ((mp -> m_next = getm (cp, NULLCP, 0, AD_NAME, NULLCP)) == NULL) admonish (NULLCP, "illegal address: %s", cp), oops++; @@ -786,7 +790,7 @@ return 1; } #else /* not BERK */ - for (mp = &mq; mp = mp -> m_next;) { + for (mp = &mq; (mp = mp -> m_next);) { if (np -> m_mbox == NULL) continue; if ((len = strlen (cp = np -> m_mbox))
--- a/sbr/path.c Thu May 03 17:09:32 2012 +0900 +++ b/sbr/path.c Wed Nov 12 02:46:27 2014 +0900 @@ -17,7 +17,7 @@ static char *pwds; static char *expath (); -static compath(); +static void compath(); char *path (name, flag) @@ -98,7 +98,7 @@ /* */ -static compath (f) +static void compath (f) register char *f; { register char *cp,
--- a/uip/Makefile Thu May 03 17:09:32 2012 +0900 +++ b/uip/Makefile Wed Nov 12 02:46:27 2014 +0900 @@ -6,9 +6,10 @@ ############################################################################## # The following entries were inserted during MH configuration +OPT = -g -Wparentheses -Wimplicit-function-declaration -Wimplicit-int BINDIR = $(DESTDIR)/usr/local/mh/bin ETCDIR = $(DESTDIR)/usr/local/mh/lib -OPTIONS = -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/less"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void -O2 -g +OPTIONS = -DATHENA -DDUMB -DFOLDPROT='"0700"' -DGCOS_HACK -DISI -DMHE -DMHRC -DMSGPROT='"0600"' -DOVERHEAD -DRPATHS -DSBACKUP='"\043"' -DWHATNOW -DBIND -DBSD42 -DBSD43 -DBSD44 -DDBMPWD -DNORUSERPASS -DPOSIX -DSETMG -DSYS5DIR -DUNISTD -DVSPRINTF -DWAITINT -DZONEINFO -DPOPSERVICE='"pop"' -DAPOP -DJAPAN -DMH_PLUS -DMIME -DMIME_HEADERS -DMORE='"/usr/local/bin/less"' -DNNTP -DMAILGROUP -DSENDMTS -DSMTP -DPOP -DSPRINTFTYPE=int -DTYPESIG=void $(OPT) LDOPTIONS= -Wl,-S -g LDOPTLIB= -ltermcap LDOPTLIB_POST= -ltermcap @@ -38,9 +39,9 @@ CP = cp LN = ln -CC = gcc -CPP = gcc -E -LD = gcc +CC = clang +CPP = clang -E +LD = clang CFLAGS = $(OPTIONS) LDFLAGS = $(LDOPTIONS) LIBES = ../config/config.o ../sbr/libmh.a ../mts/libmts.a \
--- a/uip/ali.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/ali.c Wed Nov 12 02:46:27 2014 +0900 @@ -49,6 +49,8 @@ extern struct aka *akahead; +static void print_aka ( register char *p, int list, margin); + /* */ /* ARGSUSED */ @@ -180,6 +182,7 @@ /* */ +void print_aka (p, list, margin) register char *p; int list, @@ -195,7 +198,7 @@ return; } - while (c = *p++) + while ((c = *p++)) switch (c) { case ',': if (*p)
--- a/uip/aliasbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/aliasbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -26,7 +26,7 @@ static struct aka *akalloc (); static struct home *hmalloc (); -static add_aka(); +static void add_aka(); static int aleq(), addfile(), addgroup(), addmember(), addall(); #ifndef __STDC__ @@ -474,7 +474,7 @@ /* */ -static add_aka (ak, pp) +static void add_aka (ak, pp) register struct aka *ak; register char *pp; {
--- a/uip/bbc.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/bbc.c Wed Nov 12 02:46:27 2014 +0900 @@ -163,6 +163,7 @@ struct bbcount *add_count (), *seek_count (); struct bboard *getbbaux (), *getbbvis (); static void bbreset(); +void default_bboards () ; #ifdef UCL extern char *bbs[]; @@ -171,6 +172,13 @@ #endif /* UCL */ /* */ +void bbread ( register struct bboard *bb, int vecp, char *vec[]); +void pgmread ( int pd, child_id, register struct bboard *bb); +void rcinit (register char *rc); +void rcend () ; +void rcput( register FILE *bbrc, register struct bbcount *p); +void add_bb ( register char *s, int hush); + /* ARGSUSED */ main (argc, argv) @@ -566,6 +574,7 @@ /* */ +void bbread (bb, vecp, vec) register struct bboard *bb; int vecp; @@ -661,6 +670,7 @@ /* */ +void pgmread (pd, child_id, bb) int pd, child_id; @@ -746,6 +756,7 @@ /* */ +void rcinit (rc) register char *rc; { @@ -797,6 +808,7 @@ /* */ +void rcend () { TYPESIG (*hstat) (), (*istat) (), (*qstat) (), (*tstat) (); register FILE *bbrc; @@ -825,7 +837,7 @@ changed = 0; } - +void rcput (bbrc, p) register FILE *bbrc; register struct bbcount *p; @@ -931,6 +943,7 @@ /* */ +void default_bboards () { register char *cp, **ap; @@ -987,6 +1000,7 @@ /* */ +void add_bb (s, hush) register char *s; int hush;
--- a/uip/burst.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/burst.c Wed Nov 12 02:46:27 2014 +0900 @@ -10,8 +10,10 @@ #ifdef LOCALE #include <locale.h> #endif +#include <unistd.h> -static cpybrst(), burst(); + +static void cpybrst(), burst(); /* */ static struct swit switches[] = { @@ -52,6 +54,7 @@ /* ARGSUSED */ +int main (argc, argv) int argc; char **argv; @@ -90,7 +93,7 @@ /* */ - while (cp = *argp++) { + while ((cp = *argp++)) { if (*cp == '-') switch (smatch (++cp, switches)) { case AMBIGSW: @@ -185,7 +188,7 @@ /* */ -static burst (smsgs, msgnum, inplace, quietsw, verbosw) +static void burst (smsgs, msgnum, inplace, quietsw, verbosw) register struct smsg *smsgs; int msgnum, inplace, @@ -336,7 +339,7 @@ #define S2 1 #define S3 2 -static cpybrst (in, out, ifile, ofile, len) +static void cpybrst (in, out, ifile, ofile, len) register FILE *in, *out; register char *ifile,
--- a/uip/conflict.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/conflict.c Wed Nov 12 02:46:27 2014 +0900 @@ -51,6 +51,8 @@ extern struct aka *akahead; extern struct home *homehead; +void mdrop( register char *drop); +void setup(); #if !defined(__STDC__) && !defined(__stdc__) /* __stdc__ for convex */ struct group *getgrent (), *getgrgid(); @@ -299,7 +301,7 @@ mdrop (dirs[i]); } - +void mdrop(drop) register char *drop; { @@ -347,6 +349,7 @@ /* */ +void setup () { int fd, pd[2];
--- a/uip/folder.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/folder.c Wed Nov 12 02:46:27 2014 +0900 @@ -11,7 +11,7 @@ #include <locale.h> #endif -static dodir(), addir(), addfold(), dother(); +static void dodir(), addir(), addfold(), dother(); static int pfold(), sfold(), compare(); /* */ @@ -139,7 +139,7 @@ /* */ - while (cp = *argp++) { + while ((cp = *argp++)) { if (*cp == '-') switch (smatch (++cp, switches)) { case AMBIGSW: @@ -373,7 +373,7 @@ /* */ -static dodir (dir) +static void dodir (dir) register char *dir; { int i; @@ -541,7 +541,7 @@ /* */ -static addir (name) +static void addir (name) register char *name; { register char *base, @@ -588,7 +588,7 @@ /* */ -static addfold (fold) +static void addfold (fold) register char *fold; { register int i, @@ -632,7 +632,7 @@ /* */ -static dother () { +static void dother () { int atrlen; char atrcur[BUFSIZ]; register struct node *np;
--- a/uip/forw.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/forw.c Wed Nov 12 02:46:27 2014 +0900 @@ -23,7 +23,8 @@ #define IFORMAT "digest-issue-%s" #define VFORMAT "digest-volume-%s" -static mhl_draft(), copy_draft(), build_form(); +static void mhl_draft(), copy_draft(); +static int build_form(); /* */ static struct swit switches[] = { @@ -199,7 +200,7 @@ /* */ - while (cp = *argp++) { + while ((cp = *argp++)) { if (*cp == '-') switch (smatch (++cp, switches)) { case AMBIGSW: @@ -489,7 +490,7 @@ /* */ -static mhl_draft (out, digest, volume, issue, file, filter, dashflg) +static void mhl_draft (out, digest, volume, issue, file, filter, dashflg) int out, volume, issue, @@ -559,7 +560,7 @@ /* */ -static copy_draft (out, digest, file, volume, issue, mime) +static void copy_draft (out, digest, file, volume, issue, mime) int out, volume, issue,
--- a/uip/mhlsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/mhlsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -20,6 +20,7 @@ #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> +#include <stdlib.h> #ifdef UNISTD #include <unistd.h> #endif @@ -360,11 +361,13 @@ static char *mcomp_add (), *oneline (), *parse (); static struct mcomp *add_queue (); -static mhl_format(), evalvar(), process(), mhlfile(), free_queue(), putcomp(); -static putstr(), putch(), face_format(), m_popen(); +static void mhl_format(), process(), mhlfile(), free_queue(), putcomp(); +static int evalvar(); +static void putstr(), putch(), face_format(), m_popen(); static int ptoi(), ptos(), doface(); -void clear_screen (); +extern void clear_screen0 (); +void m_pclose () ; #ifdef JAPAN static char mlbuf[BUFSIZ]; @@ -573,7 +576,7 @@ } if (clearflg > 0 && ontty == NOTTY) - clear_screen (); + clear_screen0 (); if (ontty == PITTY) m_pclose (); @@ -583,7 +586,7 @@ /* */ -static mhl_format (file, length, width) +static void mhl_format (file, length, width) register char *file; int length, width; @@ -852,7 +855,7 @@ /* */ -static process (folder, fname, ofilen, ofilec) +static void process (folder, fname, ofilen, ofilec) char *folder, *fname; int ofilen, @@ -900,7 +903,7 @@ /* */ -static mhlfile (fp, mname, ofilen, ofilec) +static void mhlfile (fp, mname, ofilen, ofilec) register FILE *fp; register char *mname; int ofilen, @@ -912,7 +915,8 @@ *c3; register char **ip; char name[NAMESZ], - buf[BUFSIZ]; + buf0[BUFSIZ]; + char *buf = buf0; if (forwall) { if (digest) @@ -932,7 +936,7 @@ if (ofilec > 1) { if (ofilen > 1) { if ((global.c_flags & CLEARSCR)) - clear_screen (); + clear_screen0 (); else printf ("\n\n\n"); } @@ -954,7 +958,7 @@ } if (index (buf, '\n')) { if ((global.c_flags & CLEARSCR)) - clear_screen (); + clear_screen0 (); } else printf ("\n"); @@ -965,7 +969,7 @@ if (ofilen > 1) { printf ("\n\n\n"); if (clearflg > 0) - clear_screen (); + clear_screen0 (); } printf (">>> %s\n\n", mname); } @@ -1132,6 +1136,9 @@ if (cp == NULL) { cp = holder.c_text + strlen(holder.c_text); } else { + if (strlen(cp+1)>sizeof(buf)) { + buf = (char*)alloca( strlen(cp+1) +1); + } strcpy(buf, ++cp); *cp = 0; (void) ml_conv_decode(holder.c_text,content_encoding,content_type); @@ -1235,7 +1242,7 @@ }; -static mcomp_format (c1, c2) +static void mcomp_format (c1, c2) register struct mcomp *c1, *c2; { @@ -1373,7 +1380,7 @@ } -static free_queue (head, tail) +static void free_queue (head, tail) register struct mcomp **head, **tail; { @@ -1402,7 +1409,7 @@ /* */ -static putcomp (c1, c2, flag) +static void putcomp (c1, c2, flag) register struct mcomp *c1, *c2; int flag; @@ -1595,7 +1602,7 @@ /* */ #ifdef JAPAN -static +static void putstr(string) char *string; { @@ -1624,7 +1631,7 @@ /* */ -static +static void putch(ch) char ch; { @@ -1648,7 +1655,7 @@ buf[0] = 0; (void) read (fileno (stdout), buf, sizeof buf); if (index (buf, '\n')) { - if (global.c_flags & CLEARSCR) clear_screen (); + if (global.c_flags & CLEARSCR) clear_screen0 (); row = 0; } else { (void) putchar('\n'); @@ -1741,7 +1748,7 @@ (void) read (fileno (stdout), buf, sizeof buf); if (index (buf, '\n')) { if (global.c_flags & CLEARSCR) - clear_screen (); + clear_screen0 (); row = 0; } else { @@ -1832,7 +1839,7 @@ /* */ -static face_format (c1) +static void face_format (c1) register struct mcomp *c1; { register char *cp; @@ -2125,7 +2132,7 @@ static int sd = NOTOK; -static m_popen (name) +static void m_popen (name) char *name; { int pd[2]; @@ -2163,7 +2170,7 @@ } } - +void m_pclose () { if (m_pid == NOTOK) return;
--- a/uip/mhn.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/mhn.c Wed Nov 12 02:46:27 2014 +0900 @@ -342,7 +342,7 @@ static CT get_content (); static int list_content (), show_content (), store_content (); -static int cache_content (); +static void cache_content (); static int user_content (), compose_content (), output_content (); static void free_content (), flush_errors (), set_id (); @@ -419,7 +419,7 @@ /* */ - while (cp = *argp++) { + while ((cp = *argp++)) { if (*cp == '-') switch (smatch (++cp, switches)) { case AMBIGSW: @@ -667,8 +667,8 @@ if (f2 || f3 || f4 || f5 || f6 || f7) adios (NULLCP, "missing -viamail \"mailpath\" switch"); - if (cp = getenv ("MHN")) { - if (fp = fopen (cp, "r")) { + if ((cp = getenv ("MHN"))) { + if ((fp = fopen (cp, "r"))) { m_readefs ((struct node **) 0, fp, cp, 0); (void) fclose (fp); @@ -676,7 +676,7 @@ else admonish ("", "unable to read $MHN profile (%s)", cp); } - if (fp = fopen (cp = libpath ("mhn_defaults"), "r")) { + if ((fp = fopen (cp = libpath ("mhn_defaults"), "r"))) { m_readefs ((struct node **) 0, fp, cp, 0); (void) fclose (fp); @@ -723,7 +723,7 @@ adios (NULLCP, "out of memory"); ctp = cts; - if (stdinP = (strcmp (file, "-") == 0)) { + if ((stdinP = (strcmp (file, "-") ) == 0)) { char buffer[BUFSIZ]; file = add (m_tmpfil (invo_name), NULLCP); @@ -751,7 +751,7 @@ if ((fp = fopen (file, "r")) == NULL) adios (file, "unable to read"); - if (ct = get_content (fp, file, 1)) { + if ((ct = get_content (fp, file, 1))) { if (stdinP) ct -> c_unlink = 1; @@ -3190,7 +3190,7 @@ NULL, CHARSET_UNKNOWN /* this one must be last! */ }; -static int free_text (ct) +static void free_text (ct) register CT ct; { register struct text *t = (struct text *) ct -> c_ctparams; @@ -3686,7 +3686,7 @@ *next; if (!m) - return; + return 0; if (m -> mp_start) free (m -> mp_start); @@ -3704,6 +3704,7 @@ free ((char *) m); ct -> c_ctparams = NULL; + return 0; } @@ -4095,7 +4096,7 @@ } -static int free_partial (ct) +static void free_partial (ct) register CT ct; { register struct partial *p = (struct partial *) ct -> c_ctparams; @@ -4307,7 +4308,7 @@ register struct exbody *e = (struct exbody *) ct -> c_ctparams; if (!e) - return; + return 0; free_content (e -> eb_content); if (e -> eb_body) @@ -4315,6 +4316,7 @@ free ((char *) e); ct -> c_ctparams = NULL; + return 0; } @@ -4705,12 +4707,13 @@ register struct cefile *ce = (struct cefile *) ct -> c_ceparams; if (!ce) - return; + return 0; if (ce -> ce_fp) { (void) fclose (ce -> ce_fp); ce -> ce_fp = NULL; } + return 0; } @@ -4757,7 +4760,7 @@ register struct cefile *ce = (struct cefile *) ct -> c_ceparams; if (!ce) - return; + return 0; if (ce -> ce_fp) { (void) fclose (ce -> ce_fp); @@ -4776,6 +4779,7 @@ } else ct -> c_ceopenfnx = NULL; + return 0; } @@ -6152,7 +6156,7 @@ /* */ -static int cache_content (ct) +static void cache_content (ct) register CT ct; { int cachetype;
--- a/uip/msh.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/msh.c Wed Nov 12 02:46:27 2014 +0900 @@ -190,14 +190,19 @@ #endif static int read_map(), read_file(), check_folder(), getargs(), parse(); -static int getcmds(), init_io(), initaux_io(), finaux_io(), peerwait(); +static int getcmds(), init_io(), peerwait(); +static void finaux_io(); +static int initaux_io(); static int pINI(), pQRY(), pQRY1(), pQRY2(), pCMD(), pFIN(); static int ttyR(), ttyNaux(), winN(), winR(), winX(); -static msh(), m_gMsgs(), scanrange(), scanstring(), quit(); -static fin_io(), m_init(); +static void msh(), m_gMsgs(), scanrange(), scanstring(), quit(); +static void fin_io(), m_init(); #if defined(BPOP) || defined(NNTP) static int read_pop(); #endif + +void readids (int id); +void display_info (int scansw); /* */ /* ARGSUSED */ @@ -241,7 +246,7 @@ /* */ - while (cp = *argp++) { + while ((cp = *argp++)) { if (*cp == '-') switch (smatch (++cp, switches)) { case AMBIGSW: @@ -462,7 +467,7 @@ /* */ -static msh (scansw) +static void msh (scansw) int scansw; { int i; @@ -925,7 +930,7 @@ /* */ -static m_gMsgs (n) +static void m_gMsgs (n) int n; { int nmsgs; @@ -1151,7 +1156,7 @@ /* */ -static scanrange (low, hgh) +static void scanrange (low, hgh) int low, hgh; { @@ -1162,7 +1167,7 @@ } -static scanstring (arg) +static void scanstring (arg) char *arg; { char *cp, @@ -1185,6 +1190,7 @@ /* */ +void readids (id) int id; { @@ -1285,6 +1291,7 @@ /* */ +void display_info (scansw) int scansw; { @@ -1333,7 +1340,7 @@ /* */ -static write_ids () { +static void write_ids () { int i = 0, flags, msgnum; @@ -1359,7 +1366,7 @@ /* */ -static quit () { +static void quit () { int i, md, msgnum; @@ -1932,7 +1939,7 @@ /* */ -static fin_io (cmdp, vio) +static void fin_io (cmdp, vio) register struct Cmd *cmdp; int vio; { @@ -1946,7 +1953,7 @@ } -static int finaux_io (cmdp) +static void finaux_io (cmdp) register struct Cmd *cmdp; { switch (cmdp -> direction) { @@ -1982,7 +1989,7 @@ /* */ -static m_init () { +static void m_init () { int msgnum; for (msgnum = mp -> lowmsg; msgnum <= mp -> hghmsg; msgnum++)
--- a/uip/mshcmds.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/mshcmds.c Wed Nov 12 02:46:27 2014 +0900 @@ -39,7 +39,7 @@ static int mhlnum; static FILE *mhlfp; -void clear_screen (); +void clear_screen0 (); static int eom_action (); static FP mhl_action (); #ifdef MIME @@ -47,7 +47,8 @@ #endif -static burst(), forw(), rmm(), show(), ask(), copy_message(), copy_digest(); +static void forw(), rmm(), show(), copy_message(), copy_digest(); +static int burst(),ask(); static int process(); /* SORTM */ static int msgsort (), subsort(); @@ -66,7 +67,7 @@ /* */ -forkcmd (args, pgm) +void forkcmd (args, pgm) char **args, *pgm; { @@ -143,6 +144,7 @@ /* */ +void distcmd (args) char **args; { @@ -157,7 +159,7 @@ return; } - while (cp = *args++) { + while ((cp = *args++)) { if (*cp == '-') switch (smatch (++cp, distswit)) { case AMBIGSW: @@ -249,6 +251,7 @@ /* */ +void explcmd (args) char **args; { @@ -268,7 +271,7 @@ return; } - while (cp = *args++) { + while ((cp = *args++)) { if (*cp == '-') switch (smatch (++cp, explswit)) { case AMBIGSW: @@ -344,7 +347,7 @@ /* */ -static burst (smsgs, msgnum, inplace, quietsw, verbosw) +static int burst (smsgs, msgnum, inplace, quietsw, verbosw) struct Msg *smsgs; int msgnum, inplace, @@ -498,6 +501,7 @@ /* */ +void filecmd (args) char **args; { @@ -516,7 +520,7 @@ return; } - while (cp = *args++) { + while ((cp = *args++) ){ if (*cp == '-') switch (i = smatch (++cp, fileswit)) { case AMBIGSW: @@ -675,6 +679,7 @@ /* */ +void foldcmd (args) char **args; { @@ -906,6 +911,7 @@ /* */ +void forwcmd (args) char **args; { @@ -1028,7 +1034,7 @@ /* */ -static forw (proc, filter, vecp, vec, mime) +static void forw (proc, filter, vecp, vec, mime) int vecp, mime; char *proc, @@ -1364,6 +1370,7 @@ /* */ +void markcmd (args) char **args; { @@ -1617,6 +1624,7 @@ /* */ +void mhncmd (args) char **args; { @@ -1733,6 +1741,7 @@ /* */ +void packcmd (args) char **args; { @@ -1923,6 +1932,7 @@ /* */ +void pickcmd (args) char **args; { @@ -2126,6 +2136,7 @@ /* */ +void replcmd (args) char **args; { @@ -2227,6 +2238,7 @@ /* */ +void rmmcmd (args) char **args; { @@ -2275,7 +2287,7 @@ struct msgs *trash (); #endif /* MH_PLUS */ -static rmm () { +static void rmm () { register int msgnum, vecp; register char *cp; @@ -2503,6 +2515,7 @@ /* */ +void scancmd (args) char **args; { @@ -2731,7 +2744,7 @@ } if (clearsw) - clear_screen (); + clear_screen0 (); } /* */ @@ -2765,6 +2778,7 @@ /* */ +void showcmd (args) char **args; { @@ -2934,7 +2948,7 @@ /* */ -static show (msgnum) +static void show (msgnum) int msgnum; { if (Msgs[msgnum].m_bboard_id == 0) @@ -3236,6 +3250,7 @@ /* */ +void sortcmd (args) char **args; { @@ -3578,7 +3593,7 @@ /* */ -static copy_message (msgnum, out) +static void copy_message (msgnum, out) int msgnum; FILE * out; { @@ -3607,7 +3622,7 @@ } -static copy_digest (msgnum, out) +static void copy_digest (msgnum, out) int msgnum; FILE * out; {
--- a/uip/post.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/post.c Wed Nov 12 02:46:27 2014 +0900 @@ -366,17 +366,19 @@ off_t lseek (); time_t time (); -static putfmt(), start_headers(), finish_headers(), putgrp(), pl(); -static anno(), make_bcc_file(), verify_all_addresses(); -static chkadr(), do_addresses(), do_text(), do_an_address(), sigon(); -static sigoff(), p_refile(), fcc(), die(), insert_fcc(), p_record (); +static void start_headers(), finish_headers(), putgrp(), pl(); +static void anno(), make_bcc_file(), verify_all_addresses(); +static void chkadr(), do_addresses(), do_text(), do_an_address(), sigon(); +static void sigoff(), p_refile(), fcc(), die(), insert_fcc(), p_record (); static int get_header(), putadr(), insert(), annoaux(); #ifdef TMA -static postplain(); +static void postplain(); #else -static post(); +static void post(); #endif /* !TMA */ +static void putfmt ( register char *name, register char *str, register FILE *out); + /* MAIN */ /* ARGSUSED */ @@ -845,7 +847,7 @@ /* DRAFT GENERATION */ -static putfmt (name, str, out) +static void putfmt (name, str, out) register char *name, *str; register FILE *out; @@ -1042,7 +1044,7 @@ /* */ -static start_headers () { +static void start_headers () { register char *cp; char *user = NULLCP, *addr; char myhost[BUFSIZ], @@ -1106,7 +1108,7 @@ /* */ -static finish_headers (out) +static void finish_headers (out) register FILE *out; { switch (msgstate) { @@ -1265,7 +1267,7 @@ /* */ -static putgrp (name, group, out, flags) +static void putgrp (name, group, out, flags) register char *name, *group; register FILE *out; @@ -1353,7 +1355,7 @@ } -static pl () { +static void pl () { register int i; register struct mailname *mp; @@ -1384,7 +1386,7 @@ /* */ -static anno () { +static void anno () { register struct mailname *mp; for (mp = localaddrs.m_next; mp; mp = mp -> m_next) @@ -1419,7 +1421,7 @@ /* */ -static insert_fcc (hdr, pp) +static void insert_fcc (hdr, pp) register struct headers *hdr; register char *pp; { @@ -1441,7 +1443,7 @@ /* BCC GENERATION */ -static make_bcc_file () { +static void make_bcc_file () { int fd, i, child_id; @@ -1587,7 +1589,7 @@ /* ADDRESS VERIFICATION */ -static verify_all_addresses (talk) +static void verify_all_addresses (talk) int talk; { #ifndef MHMTS @@ -1671,7 +1673,7 @@ /* */ -static chkadr () { +static void chkadr () { #define plural(x) (x == 1 ? "" : "s") if (badadr && unkadr) @@ -1686,9 +1688,9 @@ /* MTS INTERACTION */ #ifdef TMA -static postplain (file, bccque, talk) +static void postplain (file, bccque, talk) #else /* TMA */ -static post (file, bccque, talk) +static void post (file, bccque, talk) #endif /* TMA */ register char *file; int bccque, @@ -1953,7 +1955,7 @@ /* */ #ifndef MHMTS -static do_addresses (bccque, talk) +static void do_addresses (bccque, talk) #else /* MHMTS */ static do_addresses (file, fd, ud, bccque, talk) register char *file; @@ -2044,7 +2046,7 @@ /* */ #ifndef MHMTS -static do_text (file, fd) +static void do_text (file, fd) register char *file; int fd; { @@ -2123,7 +2125,7 @@ /* ARGSUSED */ #endif /* TMA */ -static do_an_address (lp, talk, tma) +static void do_an_address (lp, talk, tma) register struct mailname *lp; int talk, tma; @@ -2261,7 +2263,7 @@ #ifdef MHMTS /* ARGSUSED */ -static do_an_address (lp, talk, tma) +static void do_an_address (lp, talk, tma) register struct mailname *lp; int talk, tma; @@ -2354,7 +2356,7 @@ /* ARGSUSED */ #endif /* TMA */ -static do_an_address (lp, talk, tma) +static void do_an_address (lp, talk, tma) register struct mailname *lp; int talk, tma; @@ -2464,7 +2466,7 @@ #endif /* not MHMTS */ -static sigon () { +static void sigon () { if (debug) return; @@ -2482,7 +2484,7 @@ } -static sigoff () { +static void sigoff () { if (debug) return; @@ -2494,7 +2496,7 @@ /* FCC INTERACTION */ -static p_refile (file) +static void p_refile (file) register char *file; { register int i; @@ -2514,7 +2516,7 @@ } -static fcc (file, folder) +static void fcc (file, folder) register char *file, *folder; { @@ -2561,7 +2563,7 @@ /* RECORD RECIPIENTS */ -static p_record () +static void p_record () { int i, child_id, @@ -2634,7 +2636,7 @@ /* VARARGS2 */ -static die (what, fmt, a, b, c, d) +static void die (what, fmt, a, b, c, d) char *what, *fmt, *a, @@ -2667,6 +2669,7 @@ * or you will lose *BIG* */ +void err_abrt (code, fmt, a, b, c) int code; char *fmt, @@ -2688,7 +2691,7 @@ /* BUG: MHMTS ignores 822-style route addresses... */ -static localmail (lp, talk, fd) +static void localmail (lp, talk, fd) register struct mailname *lp; int talk, fd;
--- a/uip/rcvtty.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/rcvtty.c Wed Nov 12 02:46:27 2014 +0900 @@ -79,7 +79,7 @@ char *getusr (); static int message_fd(), header_fd(); -static alert(); +static void alert(); static int bell = 1; static int newline = 1; @@ -329,7 +329,7 @@ /* */ #ifndef TTYD -static alert (tty, md) +static void alert (tty, md) char *tty; int md; {
--- a/uip/replsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/replsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -68,7 +68,8 @@ NULL }; -static insert(), replfilter(); +static int insert(); +static void replfilter(); /* */ /* ARGSUSED */ @@ -437,7 +438,7 @@ /* */ -static replfilter (in, out) +static void replfilter (in, out) register FILE *in, *out; {
--- a/uip/scan.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/scan.c Wed Nov 12 02:46:27 2014 +0900 @@ -55,7 +55,7 @@ #endif -void clear_screen (); +void clear_screen0 (); /* */ @@ -314,7 +314,7 @@ /* */ if (clearflag) - clear_screen (); + clear_screen0 (); done (0); }
--- a/uip/sendsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/sendsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -12,9 +12,11 @@ #ifdef UNISTD #include <unistd.h> #endif +#include <fcntl.h> + extern char *LocalName(); -static alert(), anno(), annoaux(); +static void alert(), anno(), annoaux(); static int tmp_fd(); static int sendaux(); #ifdef MIME @@ -313,7 +315,8 @@ #endif /* */ - +extern int distout (char *, char *, char *); + #ifndef MIME static int sendaux (vec, vecp, drft, st) #else /* MIME */ @@ -357,14 +360,15 @@ drft = file; } vec[vecp++] = drft; - if (annotext) + if (annotext) { if ((fd2 = tmp_fd ()) != NOTOK) { vec[vecp++] = "-idanno"; (void) sprintf (buf, "%d", fd2); vec[vecp++] = buf; + } else { + admonish (NULLCP, "unable to create file for annotation list"); } - else - admonish (NULLCP, "unable to create file for annotation list"); + } if (distfile && distout (drft, distfile, backup) == NOTOK) done (1); vec[vecp] = NULL; @@ -418,7 +422,7 @@ /* */ -static alert (file, out) +static void alert (file, out) register char *file; int out; { @@ -438,7 +442,7 @@ (void) signal (SIGINT, SIG_IGN); (void) signal (SIGQUIT, SIG_IGN); (void) signal (SIGTERM, SIG_IGN); - if (forwsw) + if (forwsw) { if ((in = open (file, 0)) == NOTOK) admonish (file, "unable to re-open"); else { @@ -454,6 +458,7 @@ if (rename (file, strcpy (buf, m_backup (file))) == NOTOK) admonish (buf, "unable to rename %s to", file); } + } (void) lseek (out, (off_t)0, 0); (void) dup2 (out, fileno (stdin)); (void) close (out); @@ -495,7 +500,7 @@ /* */ -static anno (fd, st) +static void anno (fd, st) int fd; register struct stat *st; { @@ -547,9 +552,11 @@ } } +extern int annotate(); + /* */ -static annoaux (fd) +static void annoaux (fd) int fd; { int fd2,
--- a/uip/slocal.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/slocal.c Wed Nov 12 02:46:27 2014 +0900 @@ -211,7 +211,7 @@ #endif static int localmail(), usr_delivery(), split(), parse(), logged_in(); static int timely(), usr_file(), usr_pipe(), copyfile(); -static expand(), glob(), copyinfo(); +static void expand(), glob(), copyinfo(); /* */ @@ -857,7 +857,7 @@ #define LPAREN '(' #define RPAREN ')' -static expand (s1, s2, fd) +static void expand (s1, s2, fd) register char *s1, *s2; int fd; @@ -893,7 +893,7 @@ /* */ -static glob (fd) +static void glob (fd) register int fd; { char buffer[BUFSIZ]; @@ -1238,7 +1238,7 @@ /* */ -static copyinfo (fp, from) +static void copyinfo (fp, from) register FILE *fp; char *from; {
--- a/uip/spost.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/spost.c Wed Nov 12 02:46:27 2014 +0900 @@ -212,9 +212,9 @@ static struct headers *hdrtab; /* table for the message we're doing */ static FILE *out; /* output (temp) file */ -static putfmt(), start_headers(), finish_headers(), putadr(), +static void putfmt(), start_headers(), finish_headers(), putadr(), insert_fcc(); -static file(), fcc(); +static void file(), fcc(); static int get_header(), putone(); /* MAIN */ @@ -529,7 +529,7 @@ /* DRAFT GENERATION */ -static putfmt (name, str, out) +static void putfmt (name, str, out) char *name, *str; FILE * out; @@ -639,7 +639,7 @@ /* */ -static +static void start_headers () { char *cp; @@ -668,7 +668,7 @@ /* */ -static +static void finish_headers (out) FILE * out; { @@ -726,7 +726,7 @@ * is a linked list of mailname structs. "nl" points to the head * of the list. Alias substitution should be done on nl. */ -static putadr (name, nl) +static void putadr (name, nl) char *name; struct mailname *nl; { @@ -835,7 +835,7 @@ /* */ -static insert_fcc (hdr, pp) +static void insert_fcc (hdr, pp) struct headers *hdr; char *pp; { @@ -858,7 +858,7 @@ #ifdef notdef /* BCC GENERATION */ -static make_bcc_file () { +static void make_bcc_file () { int fd, i, child_id, @@ -921,7 +921,7 @@ /* FCC INTERACTION */ -static file (path) +static void file (path) char *path; { int i; @@ -937,7 +937,7 @@ } -static fcc (file, folder) +static void fcc (file, folder) char *file, *folder; {
--- a/uip/trmsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/trmsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -19,6 +19,9 @@ #undef TIOCGWINSZ #endif /* SYS5 */ +#include <curses.h> +#include <term.h> + #if BUFSIZ<2048 #define TXTSIZ 2048 @@ -53,7 +56,7 @@ /* */ -static read_termcap () { +static void read_termcap () { register char *bp, *term; char *cp, @@ -88,7 +91,7 @@ cp = termcap; CL = tgetstr ("cl", &cp); - if (bp = tgetstr ("pc", &cp)) + if ((bp = tgetstr ("pc", &cp))) PC = *bp; if (tgetnum ("sg") <= 0) { SE = tgetstr ("se", &cp); @@ -134,11 +137,11 @@ static int outc (c) register char c; { - (void) putchar (c); + return putchar (c); } -void clear_screen () { +void clear_screen0 () { read_termcap (); if (CL && ospeed)
--- a/uip/whatnowsbr.c Thu May 03 17:09:32 2012 +0900 +++ b/uip/whatnowsbr.c Wed Nov 12 02:46:27 2014 +0900 @@ -18,7 +18,8 @@ #define MIMEminc(a) 0 #endif -static int editfile(), copyf(), sendfile(), sendit(), whomfile(); +static int editfile(), copyf(), sendfile(), whomfile(); +static void sendit(); #ifdef MIME static int mhnfile(); #endif @@ -694,7 +695,7 @@ /* */ -static sendit (sp, arg, file, pushed) +static void sendit (sp, arg, file, pushed) register char *sp, **arg, *file;
--- a/zotnet/mts/lock.c Thu May 03 17:09:32 2012 +0900 +++ b/zotnet/mts/lock.c Wed Nov 12 02:46:27 2014 +0900 @@ -78,6 +78,8 @@ #endif #include <errno.h> +#include <unistd.h> + #ifdef LOCKONLY #ifndef MMDFONLY @@ -100,13 +102,15 @@ #endif /* MAILLOCK */ static int b_lkopen(), lockit(), f_lkopen(); -static lockname(), timerON(), timerOFF(); +static void lockname(), timerON(), timerOFF(); time_t time (); char *mktemp (); /* */ +extern void mts_init (const char *); + int lkopen (file, access) register char *file; register int access; @@ -201,7 +205,7 @@ /* */ -static lockname (curlock, tmplock, file, dev, ino) +static void lockname (curlock, tmplock, file, dev, ino) register char *curlock, *tmplock, *file; @@ -617,10 +621,10 @@ /* */ #ifdef LIBLOCKFILE -static timerON (lock, fd, ltype) +static void timerON (lock, fd, ltype) int ltype; #else -static timerON (lock, fd) +static void timerON (lock, fd) #endif char *lock; int fd; @@ -651,7 +655,7 @@ } -static timerOFF (fd) +static void timerOFF (fd) int fd; { register struct lock *pp,
--- a/zotnet/mts/mts.c Thu May 03 17:09:32 2012 +0900 +++ b/zotnet/mts/mts.c Wed Nov 12 02:46:27 2014 +0900 @@ -26,6 +26,9 @@ #endif /* SYS5 */ #endif /* NETWORK */ #include <pwd.h> +#include <netdb.h> +#include <unistd.h> + #define NOTOK (-1) @@ -253,6 +256,7 @@ /* ARGSUSED */ +void mts_init (name) char *name; { @@ -392,7 +396,7 @@ #ifndef BIND sethostent (1); #endif - if (hp = mh_gethostbyname (buffer)) + if ((hp = mh_gethostbyname (buffer))) (void) strcpy (buffer, hp -> h_name); #endif /* BSD42 or SOCKETS */ #else /* not NETWORK */ @@ -520,7 +524,7 @@ || pw -> pw_name == NULL || *pw -> pw_name == '\0') { #else /* __CYGWIN32__ */ - if ((pw = getpwuid (getuid ())) == NULL + if (((pw = getpwuid (getuid ())) == NULL) || pw -> pw_name == NULL || *pw -> pw_name == '\0') { #endif /* __CYGWIN32__ */
--- a/zotnet/tws/dtimep.c Thu May 03 17:09:32 2012 +0900 +++ b/zotnet/tws/dtimep.c Wed Nov 12 02:46:27 2014 +0900 @@ -115,7 +115,9 @@ #endif /* BSD42 */ #endif -static zonehack (tw) +extern int lex_string( char **, int) ; + +static void zonehack (tw) register struct tws *tw; { register struct tm *tm;