nmh-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Nmh-commits] nmh/uip Makefile.in, 1.15.2.1, 1.15.2.2 annosbr.c, 1.3.2.1


From: Ken Hornstein <address@hidden>
Subject: [Nmh-commits] nmh/uip Makefile.in, 1.15.2.1, 1.15.2.2 annosbr.c, 1.3.2.1, 1.3.2.2 dropsbr.c, 1.7, 1.7.2.1 fmtdump.c, 1.5, 1.5.2.1 folder.c, 1.4.2.1, 1.4.2.2 inc.c, 1.13.2.1, 1.13.2.2 mhbuild.c, 1.7, 1.7.2.1 mhbuildsbr.c, 1.8, 1.8.2.1 mhcachesbr.c, 1.6, 1.6.2.1 mhfree.c, 1.2, 1.2.2.1 mhlist.c, 1.7, 1.7.2.1 mhlistsbr.c, 1.5, 1.5.2.1 mhmisc.c, 1.3, 1.3.2.1 mhn.c, 1.7, 1.7.2.1 mhoutsbr.c, 1.6, 1.6.2.1 mhparse.c, 1.9, 1.9.2.1 mhshow.c, 1.7, 1.7.2.1 mhshowsbr.c, 1.10, 1.10.2.1 mhstore.c, 1.7, 1.7.2.1 mhstoresbr.c, 1.7.2.1, 1.7.2.2 mhtest.c, 1.7, 1.7.2.1 mshcmds.c, 1.11, 1.11.2.1 packf.c, 1.4, 1.4.2.1 pick.c, 1.5, 1.5.2.1 popi.c, 1.6, 1.6.2.1 prompter.c, 1.4, 1.4.2.1 rcvstore.c, 1.7.2.1, 1.7.2.2 refile.c, 1.4.2.1, 1.4.2.2 replsbr.c, 1.3, 1.3.2.1 scan.c, 1.8.2.2, 1.8.2.3 scansbr.c, 1.5, 1.5.2.1 send.c, 1.5.2.1, 1.5.2.2 show.c, 1.5, 1.5.2.1 slocal.c, 1.14, 1.14.2.1 sortm.c, 1.5.2.1, 1.5.2.2 spost.c, 1.13, 1.13.2.1 viamail.c, 1.7.2.1, 1.7.2.2 vmh.c, 1.4, 1.4.2.1 wmh.c, 1.4, 1.4.2.1
Date: Fri, 24 Oct 2003 20:14:51 +0000

Update of /cvsroot/nmh/nmh/uip
In directory subversions:/tmp/cvs-serv30347/uip

Modified Files:
      Tag: RELEASE_1_1
        Makefile.in annosbr.c dropsbr.c fmtdump.c folder.c inc.c 
        mhbuild.c mhbuildsbr.c mhcachesbr.c mhfree.c mhlist.c 
        mhlistsbr.c mhmisc.c mhn.c mhoutsbr.c mhparse.c mhshow.c 
        mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c mshcmds.c packf.c 
        pick.c popi.c prompter.c rcvstore.c refile.c replsbr.c scan.c 
        scansbr.c send.c show.c slocal.c sortm.c spost.c viamail.c 
        vmh.c wmh.c 
Log Message:
Merge in changes that didn't make it onto the release branch.


Index: send.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/send.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** send.c      28 Feb 2003 19:08:36 -0000      1.5.2.1
--- send.c      24 Oct 2003 20:14:49 -0000      1.5.2.2
***************
*** 130,134 ****
  extern char *distfile;
  
- extern int   errno;
  
  int
--- 130,133 ----

Index: mhstoresbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhstoresbr.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** mhstoresbr.c        28 Feb 2003 19:08:36 -0000      1.7.2.1
--- mhstoresbr.c        24 Oct 2003 20:14:48 -0000      1.7.2.2
***************
*** 22,26 ****
  #include <h/mhparse.h>
  
- extern int errno;
  
  /*
--- 22,25 ----

Index: mhn.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhn.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhn.c       2 Jul 2002 22:09:14 -0000       1.7
--- mhn.c       24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 132,137 ****
  
  
- extern int errno;
- 
  /* mhparse.c */
  extern int checksw;
--- 132,135 ----

Index: scan.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/scan.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** scan.c      28 Feb 2003 19:08:36 -0000      1.8.2.2
--- scan.c      24 Oct 2003 20:14:49 -0000      1.8.2.3
***************
*** 52,56 ****
  };
  
- extern int errno;
  
  /*
--- 52,55 ----

Index: mhoutsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhoutsbr.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** mhoutsbr.c  2 Jul 2002 22:09:14 -0000       1.6
--- mhoutsbr.c  24 Oct 2003 20:14:48 -0000      1.6.2.1
***************
*** 27,31 ****
  
  
- extern int errno;
  extern int ebcdicsw;
  
--- 27,30 ----

Index: dropsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/dropsbr.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** dropsbr.c   2 Jul 2002 22:09:14 -0000       1.7
--- dropsbr.c   24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 36,41 ****
  #include <fcntl.h>
  
- extern int errno;
- 
  /*
   * static prototypes
--- 36,39 ----

Index: mhshowsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhshowsbr.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** mhshowsbr.c 2 Jul 2002 22:09:14 -0000       1.10
--- mhshowsbr.c 24 Oct 2003 20:14:48 -0000      1.10.2.1
***************
*** 36,40 ****
  #endif
  
- extern int errno;
  extern int debugsw;
  
--- 36,39 ----

Index: rcvstore.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/rcvstore.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** rcvstore.c  28 Feb 2003 19:08:36 -0000      1.7.2.1
--- rcvstore.c  24 Oct 2003 20:14:49 -0000      1.7.2.2
***************
*** 43,47 ****
  };
  
- extern int errno;
  
  /*
--- 43,46 ----

Index: packf.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/packf.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** packf.c     2 Jul 2002 22:09:15 -0000       1.4
--- packf.c     24 Oct 2003 20:14:49 -0000      1.4.2.1
***************
*** 36,41 ****
  };
  
- extern int errno;
- 
  static int md = NOTOK;
  static int mbx_style = MBOX_FORMAT;
--- 36,39 ----

Index: fmtdump.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/fmtdump.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** fmtdump.c   2 Jul 2002 22:09:14 -0000       1.5
--- fmtdump.c   24 Oct 2003 20:14:48 -0000      1.5.2.1
***************
*** 40,43 ****
--- 40,44 ----
  static char *f_typestr(int);
  static char *c_typestr(int);
+ static char *c_flagsstr(int);
  static void litputs(char *);
  static void litputc(char);
***************
*** 164,168 ****
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %d", fmt->f_comp->c_flags);
                break;
  
--- 165,169 ----
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %s", 
c_flagsstr(fmt->f_comp->c_flags));
                break;
  
***************
*** 196,200 ****
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %d", fmt->f_comp->c_flags);
                break;
  
--- 197,201 ----
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %s", 
c_flagsstr(fmt->f_comp->c_flags));
                break;
  
***************
*** 218,222 ****
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %d", fmt->f_comp->c_flags);
                break;
  
--- 219,223 ----
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %s", 
c_flagsstr(fmt->f_comp->c_flags));
                break;
  
***************
*** 229,233 ****
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %d", fmt->f_comp->c_flags);
                break;
  
--- 230,234 ----
                        printf(", c_type %s", c_typestr(fmt->f_comp->c_type));
                if (fmt->f_comp->c_flags)
!                       printf(", c_flags %s", 
c_flagsstr(fmt->f_comp->c_flags));
                break;
  
***************
*** 453,457 ****
  
        buf[0] = '\0';
!       if (t & ~(CT_ADDR|CT_DATE|CT_MYMBOX|CT_ADDRPARSE))
                printf(buf, "0x%x ", t);
        strcat(buf, "<");
--- 454,458 ----
  
        buf[0] = '\0';
!       if (t & ~(CT_ADDR|CT_DATE))
                printf(buf, "0x%x ", t);
        strcat(buf, "<");
***************
*** 459,468 ****
        FNORD(CT_ADDR, "ADDR");
        FNORD(CT_DATE, "DATE");
-       FNORD(CT_MYMBOX, "MYMBOX");
-       FNORD(CT_ADDRPARSE, "ADDRPARSE");
        strcat(buf, ">");
        return(buf);
- #undef FNORD
  }
  
  static void
--- 460,485 ----
        FNORD(CT_ADDR, "ADDR");
        FNORD(CT_DATE, "DATE");
        strcat(buf, ">");
        return(buf);
  }
+ 
+ static char *
+ c_flagsstr(int t)
+ {
+       register int i;
+       static char buf[64];
+ 
+       buf[0] = '\0';
+       if (t & ~(CF_TRUE|CF_PARSED|CF_DATEFAB))
+               printf(buf, "0x%x ", t);
+       strcat(buf, "<");
+       i = 0;
+       FNORD(CF_TRUE, "TRUE");
+       FNORD(CF_PARSED, "PARSED");
+       FNORD(CF_DATEFAB, "DATEFAB");
+       strcat(buf, ">");
+       return(buf);
+ }
+ #undef FNORD
  
  static void

Index: mhstore.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhstore.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhstore.c   2 Jul 2002 22:09:14 -0000       1.7
--- mhstore.c   24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 70,75 ****
  
  
- extern int errno;
- 
  /* mhparse.c */
  extern int checksw;
--- 70,73 ----

Index: wmh.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/wmh.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** wmh.c       2 Jul 2002 22:09:15 -0000       1.4
--- wmh.c       24 Oct 2003 20:14:49 -0000      1.4.2.1
***************
*** 129,133 ****
  static struct ltchars ltc;
  
- extern int errno;
  
  int ALRMser (), PIPEser (), SIGser ();
--- 129,132 ----

Index: refile.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/refile.c,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** refile.c    28 Feb 2003 19:08:36 -0000      1.4.2.1
--- refile.c    24 Oct 2003 20:14:49 -0000      1.4.2.2
***************
*** 52,57 ****
  };
  
- extern int errno;
- 
  static char maildir[BUFSIZ];
  
--- 52,55 ----

Index: mhmisc.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhmisc.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** mhmisc.c    2 Jul 2002 22:09:14 -0000       1.3
--- mhmisc.c    24 Oct 2003 20:14:48 -0000      1.3.2.1
***************
*** 15,19 ****
  #include <h/mhparse.h>
  
- extern int errno;
  extern int debugsw;
  
--- 15,18 ----

Index: popi.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/popi.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** popi.c      2 Jul 2002 22:09:15 -0000       1.6
--- popi.c      24 Oct 2003 20:14:49 -0000      1.6.2.1
***************
*** 81,85 ****
  static struct msgs *mp;
  
- extern int errno;
  extern char response[];
  
--- 81,84 ----

Index: mhcachesbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhcachesbr.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** mhcachesbr.c        2 Jul 2002 22:09:14 -0000       1.6
--- mhcachesbr.c        24 Oct 2003 20:14:48 -0000      1.6.2.1
***************
*** 38,43 ****
  #endif
  
- 
- extern int errno;
  extern int debugsw;
  
--- 38,41 ----

Index: slocal.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/slocal.c,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** slocal.c    2 Jul 2002 22:09:15 -0000       1.14
--- slocal.c    24 Oct 2003 20:14:49 -0000      1.14.2.1
***************
*** 53,58 ****
--- 53,67 ----
  #include <db1/ndbm.h>
  #else
+ #ifdef HAVE_GDBM_NDBM_H
+ #include <gdbm/ndbm.h>
+ #else
+ #if defined(HAVE_DB_H) && defined(HAVE_LIBDB)
+ #define DB_DBM_HSEARCH 1
+ #include <db.h>
+ #else
  #include <ndbm.h>
  #endif
+ #endif
+ #endif
  
  #include <utmp.h>
***************
*** 457,461 ****
  usr_delivery (int fd, char *delivery, int su)
  {
!     int i, accept, status, won, vecp, next;
      char *field, *pattern, *action, *result, *string;
      char buffer[BUFSIZ], tmpbuf[BUFSIZ];
--- 466,470 ----
  usr_delivery (int fd, char *delivery, int su)
  {
!     int i, accept, status=1, won, vecp, next;
      char *field, *pattern, *action, *result, *string;
      char buffer[BUFSIZ], tmpbuf[BUFSIZ];
***************
*** 660,663 ****
--- 669,674 ----
                break;
        }
+ 
+       if (status) next = 0;   /* action failed, mark for 'N' result */
  
        if (accept && status == 0)

Index: mhlistsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhlistsbr.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** mhlistsbr.c 2 Jul 2002 22:09:14 -0000       1.5
--- mhlistsbr.c 24 Oct 2003 20:14:48 -0000      1.5.2.1
***************
*** 21,26 ****
  #include <h/mhparse.h>
  
- extern int errno;
- 
  /* mhmisc.c */
  int part_ok (CT, int);
--- 21,24 ----

Index: prompter.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/prompter.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** prompter.c  2 Jul 2002 22:09:15 -0000       1.4
--- prompter.c  24 Oct 2003 20:14:49 -0000      1.4.2.1
***************
*** 65,69 ****
  };
  
- extern int errno;
  
  #ifdef HAVE_TERMIOS_H
--- 65,68 ----

Index: mhshow.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhshow.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhshow.c    2 Jul 2002 22:09:14 -0000       1.7
--- mhshow.c    24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 88,93 ****
  
  
- extern int errno;
- 
  /* mhparse.c */
  extern int checksw;
--- 88,91 ----

Index: replsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/replsbr.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** replsbr.c   2 Jul 2002 22:09:15 -0000       1.3
--- replsbr.c   24 Oct 2003 20:14:49 -0000      1.3.2.1
***************
*** 77,87 ****
      register char **ap;
      register struct comp **savecomp;
!     int       char_read = 0, format_len;
      char name[NAMESZ], *scanl, *cp;
      FILE *out;
  
!     umask(~m_gmprot());
      if ((out = fopen (drft, "w")) == NULL)
        adios (drft, "unable to create");
  
      /* get new format string */
--- 77,89 ----
      register char **ap;
      register struct comp **savecomp;
!     int       char_read = 0, format_len, mask;
      char name[NAMESZ], *scanl, *cp;
      FILE *out;
  
!     mask = umask(~m_gmprot());
      if ((out = fopen (drft, "w")) == NULL)
        adios (drft, "unable to create");
+ 
+     umask(mask);
  
      /* get new format string */

Index: mhbuildsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhbuildsbr.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** mhbuildsbr.c        2 Jul 2002 22:09:14 -0000       1.8
--- mhbuildsbr.c        24 Oct 2003 20:14:48 -0000      1.8.2.1
***************
*** 45,50 ****
  
  
- extern int errno;
- 
  extern int debugsw;
  extern int verbosw;
--- 45,48 ----

Index: viamail.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/viamail.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** viamail.c   28 Feb 2003 19:08:36 -0000      1.7.2.1
--- viamail.c   24 Oct 2003 20:14:49 -0000      1.7.2.2
***************
*** 53,57 ****
  };
  
- extern int errno;
  extern int debugsw;
  extern int splitsw;
--- 53,56 ----

Index: mhparse.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhparse.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** mhparse.c   2 Jul 2002 22:09:14 -0000       1.9
--- mhparse.c   24 Oct 2003 20:14:48 -0000      1.9.2.1
***************
*** 27,31 ****
  
  
- extern int errno;
  extern int debugsw;
  
--- 27,30 ----
***************
*** 182,186 ****
      { "8bit",           CE_8BIT,      Init7Bit },
      { "7bit",           CE_7BIT,      Init7Bit },
!     { "binary",                 CE_BINARY,    NULL },
      { NULL,             CE_EXTENSION, NULL },  /* these two must be last! */
      { NULL,             CE_UNKNOWN,   NULL },
--- 181,185 ----
      { "8bit",           CE_8BIT,      Init7Bit },
      { "7bit",           CE_7BIT,      Init7Bit },
!     { "binary",                 CE_BINARY,    Init7Bit },
      { NULL,             CE_EXTENSION, NULL },  /* these two must be last! */
      { NULL,             CE_UNKNOWN,   NULL },
***************
*** 989,992 ****
--- 988,992 ----
       * required for multipart messages.
       */
+     bp = 0;
      for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
        if (!strcasecmp (*ap, "boundary")) {

Index: scansbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/scansbr.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** scansbr.c   2 Jul 2002 22:09:15 -0000       1.5
--- scansbr.c   24 Oct 2003 20:14:49 -0000      1.5.2.1
***************
*** 332,338 ****
                    adios (NULL, "unable to allocate tws buffer");
                *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
!               datecomp->c_flags = -1;
            } else {
!               datecomp->c_flags = 0;
            }
        }
--- 332,338 ----
                    adios (NULL, "unable to allocate tws buffer");
                *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
!               datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
            } else {
!               datecomp->c_flags &= ~CF_DATEFAB;
            }
        }

Index: folder.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/folder.c,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** folder.c    28 Feb 2003 19:08:36 -0000      1.4.2.1
--- folder.c    24 Oct 2003 20:14:48 -0000      1.4.2.2
***************
*** 67,72 ****
  };
  
- extern int errno;
- 
  static int fshort   = 0;      /* output only folder names                 */
  static int fcreat   = 0;      /* should we ask to create new folders?     */
--- 67,70 ----

Index: mshcmds.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mshcmds.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** mshcmds.c   2 Jul 2002 22:09:14 -0000       1.11
--- mshcmds.c   24 Oct 2003 20:14:49 -0000      1.11.2.1
***************
*** 23,27 ****
  #include <h/picksbr.h>
  
- extern int errno;
  
  static char delim3[] = "-------";     /* from burst.c */
--- 23,26 ----
***************
*** 3010,3014 ****
      if ((out = fopen (tmpfil, "w")) == NULL) {
        int olderr;
-       extern int errno;
        char newfil[80];
  
--- 3009,3012 ----

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/Makefile.in,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** Makefile.in 28 Feb 2003 19:08:36 -0000      1.15.2.1
--- Makefile.in 24 Oct 2003 20:14:48 -0000      1.15.2.2
***************
*** 267,270 ****
--- 267,271 ----
        rm -f $(bindir)/prev
        rm -f $(bindir)/next
+       rm -f $(libdir)/install-mh
        $(LN) $(bindir)/flist  $(bindir)/flists
        $(LN) $(bindir)/folder $(bindir)/folders

Index: mhbuild.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhbuild.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhbuild.c   2 Jul 2002 22:09:14 -0000       1.7
--- mhbuild.c   24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 69,74 ****
  
  
- extern int errno;
- 
  /* mhbuildsbr.c */
  extern int checksw;
--- 69,72 ----

Index: annosbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/annosbr.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** annosbr.c   28 Feb 2003 19:08:36 -0000      1.3.2.1
--- annosbr.c   24 Oct 2003 20:14:48 -0000      1.3.2.2
***************
*** 15,19 ****
  #include <errno.h>
  
- extern int  errno;
  
  /*
--- 15,18 ----

Index: mhtest.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhtest.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhtest.c    2 Jul 2002 22:09:14 -0000       1.7
--- mhtest.c    24 Oct 2003 20:14:49 -0000      1.7.2.1
***************
*** 68,73 ****
  
  
- extern int errno;
- 
  int ebcdicsw = 0;     /* hack for linking purposes */
  
--- 68,71 ----

Index: show.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/show.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** show.c      2 Jul 2002 22:09:15 -0000       1.5
--- show.c      24 Oct 2003 20:14:49 -0000      1.5.2.1
***************
*** 475,479 ****
                        } else {
                            for (bp = dp; *bp; bp++)
!                               if (isspace (*bp)) {
                                    *bp = '\0';
                                    break;
--- 475,479 ----
                        } else {
                            for (bp = dp; *bp; bp++)
!                               if (!istoken (*bp)) {
                                    *bp = '\0';
                                    break;

Index: mhlist.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhlist.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** mhlist.c    2 Jul 2002 22:09:14 -0000       1.7
--- mhlist.c    24 Oct 2003 20:14:48 -0000      1.7.2.1
***************
*** 74,79 ****
  
  
- extern int errno;
- 
  /* mhparse.c */
  extern int checksw;
--- 74,77 ----

Index: spost.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/spost.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** spost.c     2 Jul 2002 22:09:15 -0000       1.13
--- spost.c     24 Oct 2003 20:14:49 -0000      1.13.2.1
***************
*** 182,185 ****
--- 182,187 ----
  extern char *getusername (void);
  
+ extern boolean  draft_from_masquerading;  /* defined in mts.c */
+ 
  /*
   * static prototypes
***************
*** 579,586 ****
            if (!(msgflags & MDAT))
                fprintf (out, "Date: %s\n", dtimenow (0));
!           if (msgflags & MFRM)
!               fprintf (out, "Sender: %s\n", from);
            else
                fprintf (out, "From: %s\n", signature);
  #ifdef notdef
            if (!(msgflags & MVIS))
--- 581,597 ----
            if (!(msgflags & MDAT))
                fprintf (out, "Date: %s\n", dtimenow (0));
!           
!           if (msgflags & MFRM) {
!               /* There was already a From: in the draft.  Don't add one. */
!               if (!draft_from_masquerading)
!                   /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
!                      so we'll reveal the user's actual address@hidden
!                      address in a Sender: header (and use it as the envelope
!                      From: later). */
!                   fprintf (out, "Sender: %s\n", from);
!           }
            else
                fprintf (out, "From: %s\n", signature);
+          
  #ifdef notdef
            if (!(msgflags & MVIS))
***************
*** 592,598 ****
            if (!(msgflags & MRDT))
                fprintf (out, "Resent-Date: %s\n", dtimenow(0));
!           if (msgflags & MRFM)
!               fprintf (out, "Resent-Sender: %s\n", from);
            else
                fprintf (out, "Resent-From: %s\n", signature);
  #ifdef notdef
--- 603,617 ----
            if (!(msgflags & MRDT))
                fprintf (out, "Resent-Date: %s\n", dtimenow(0));
!           if (msgflags & MRFM) {
!               /* There was already a Resent-From: in draft.  Don't add one. */
!               if (!draft_from_masquerading)
!                   /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
!                      so we'll reveal the user's actual address@hidden
!                      address in a Sender: header (and use it as the envelope
!                      From: later). */
!                   fprintf (out, "Resent-Sender: %s\n", from);
!           }
            else
+               /* Construct a Resent-From: header. */
                fprintf (out, "Resent-From: %s\n", signature);
  #ifdef notdef

Index: inc.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/inc.c,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** inc.c       28 Feb 2003 19:08:36 -0000      1.13.2.1
--- inc.c       24 Oct 2003 20:14:48 -0000      1.13.2.2
***************
*** 135,140 ****
  };
  
- extern int errno;
- 
  /*
   * flags for the mail source
--- 135,138 ----
***************
*** 845,848 ****
--- 843,849 ----
                msgnum++;
                mp->hghmsg++;
+               mp->nummsg++;
+               if (mp->lowmsg == 0) mp->lowmsg = 1;
+ 
                clear_msg_flags (mp, msgnum);
                set_exists (mp, msgnum);

Index: vmh.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/vmh.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** vmh.c       2 Jul 2002 22:09:15 -0000       1.4
--- vmh.c       24 Oct 2003 20:14:49 -0000      1.4.2.1
***************
*** 204,208 ****
  
                                        /* MISCELLANY */
- extern int errno;
  
  /*
--- 204,207 ----

Index: sortm.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/sortm.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** sortm.c     28 Feb 2003 19:08:36 -0000      1.5.2.1
--- sortm.c     24 Oct 2003 20:14:49 -0000      1.5.2.2
***************
*** 444,465 ****
            cp = subjcomp;
            cp2 = subjcomp;
!           if (strcmp (subjsort, "subject") == 0)
                while ((c = *cp)) {
                    if (! isspace(c)) {
                        if(uprf(cp, "re:"))
                            cp += 2;
!                       else {
!                           if (isalnum(c))
!                               *cp2++ = isupper(c) ? tolower(c) : c;
                            break;
-                       }
                    }
                    cp++;
                }
            while ((c = *cp++)) {
                if (isalnum(c))
                    *cp2++ = isupper(c) ? tolower(c) : c;
- 
            }
            *cp2 = '\0';
        }
--- 444,464 ----
            cp = subjcomp;
            cp2 = subjcomp;
!           if (strcmp (subjsort, "subject") == 0) {
                while ((c = *cp)) {
                    if (! isspace(c)) {
                        if(uprf(cp, "re:"))
                            cp += 2;
!                       else
                            break;
                    }
                    cp++;
                }
+           }
+ 
            while ((c = *cp++)) {
                if (isalnum(c))
                    *cp2++ = isupper(c) ? tolower(c) : c;
            }
+ 
            *cp2 = '\0';
        }

Index: mhfree.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhfree.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** mhfree.c    2 Jul 2002 22:09:14 -0000       1.2
--- mhfree.c    24 Oct 2003 20:14:48 -0000      1.2.2.1
***************
*** 16,21 ****
  #include <h/mhparse.h>
  
- extern int errno;
- 
  /*
   * prototypes
--- 16,19 ----
***************
*** 272,275 ****
--- 270,274 ----
            unlink (ce->ce_file);
        free (ce->ce_file);
+       ce->ce_file = NULL;
      }
  

Index: pick.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/pick.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** pick.c      2 Jul 2002 22:09:15 -0000       1.5
--- pick.c      24 Oct 2003 20:14:49 -0000      1.5.2.1
***************
*** 73,77 ****
  };
  
! static int listsw = 0;
  
  
--- 73,77 ----
  };
  
! static int listsw = -1;
  
  
***************
*** 116,119 ****
--- 116,120 ----
            case AMBIGSW: 
                ambigsw (cp, switches);
+               listsw = 0;     /* HACK */
                done (1);
            case UNKWNSW: 
***************
*** 128,131 ****
--- 129,133 ----
            case VERSIONSW:
                print_version(invo_name);
+               listsw = 0;     /* HACK */
                done (1);
  
***************
*** 164,168 ****
                    adios (NULL, "too many sequences (more than %d) specified", 
NUMATTRS);
                seqs[seqp++] = cp;
-               listsw = 0;
                continue;
            case PUBLSW: 
--- 166,169 ----
***************
*** 180,184 ****
  
            case LISTSW: 
!               listsw++;
                continue;
            case NLISTSW: 
--- 181,185 ----
  
            case LISTSW: 
!               listsw = 1;
                continue;
            case NLISTSW: 
***************
*** 241,248 ****
      /*
       * If we aren't saving the results to a sequence,
!      * we need to list the results.
       */
!     if (seqp == 0)
!       listsw++;
  
      if (publicsw == 1 && is_readonly(mp))
--- 242,249 ----
      /*
       * If we aren't saving the results to a sequence,
!      * we default to list the results.
       */
!     if (listsw == -1)
!       listsw = !seqp;
  
      if (publicsw == 1 && is_readonly(mp))





reply via email to

[Prev in Thread] Current Thread [Next in Thread]