[Nmh-commits] CVS: nmh/uip slocal.c,1.15,1.16

[Glenn Burkhardt <address@hidden>]

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

Modified Files:
        slocal.c 
Log Message:
status of action wasn't saved for use by 'N' result, so when 'N' was
used slocal could perform the action even if the previous
action failed.  Debian bug report #149745, filed by Daniel Müller.
        

Index: slocal.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/slocal.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** slocal.c    22 Jun 2003 23:59:16 -0000      1.15
--- slocal.c    22 Sep 2003 00:43:09 -0000      1.16
***************
*** 461,465 ****
  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];
--- 461,465 ----
  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];
***************
*** 664,667 ****
--- 664,669 ----
                break;
        }
+ 
+       if (status) next = 0;   /* action failed, mark for 'N' result */
  
        if (accept && status == 0)