syd@dsinc.DSI.COM (Syd Weinstein) (12/06/90)
Add yp search to /etc/yp as well as /usr/etc/yp
From: Lee Ziegenhals
Remove start_highlight and end_highlight, no longer used
From: W. David Higgins
Add uninstall target to doc Makefile.SH
From: Rusty Haddock
Init time zone header to avoid garbage strings
From: Norman J. Meluch
Added FAILED_SAVE log case to filter utils.
Fixed out of order lines.
From: Steve Campbell
Remove opterr from newmail, unused and some getopts
dont define it.
From: Syd via Peter King
Fix arepdaem lock file creation flags, wrong modes left over
from open call
From: Syd via Terry Furman
Fix header end on reply due to white space continuation allowing
it to go too far.
From: Syd via report from Tom Davis <tdd@endure.cl.msu.edu>
Fix: From rn, say "| patch -p -N -d DIR", where DIR is your elm source
directory. Outside of rn, say "cd DIR; patch -p -N <thisarticle".
If you don't have the patch program, apply the following by hand,
or get patch (version 2.0, latest patchlevel).
After patching:
sh Configure -d
make
make install
If patch indicates that patchlevel is the wrong version, you may need
to apply one or more previous patches, or the patch may already
have been applied. See the patchlevel.h file to find out what has or
has not been applied. In any event, don't continue with the patch.
If you are missing previous patches they can be obtained from our:
archive server.
Syd Weinstein
elm@DSI.COM
The patches are available from the dsinc archive server
Send the following message to archive-server@DSI.COM for
a list of available patches:
Subject: patch list
send index elm
Index: hdrs/patchlevel.h
Prereq: 8
*** ../elm2.3/hdrs/patchlevel.h Wed Oct 10 13:11:12 1990
--- hdrs/patchlevel.h Wed Oct 24 15:34:56 1990
***************
*** 1 ****
! #define PATCHLEVEL 8
--- 1 ----
! #define PATCHLEVEL 9
Index: Configure
Prereq: 4.1.1.10
*** ../elm2.3/Configure Sun Oct 7 21:54:51 1990
--- Configure Wed Oct 24 16:37:22 1990
***************
*** 8,14 ****
# and edit it to reflect your system. Some packages may include samples
# of config.h for certain machines, so you might look for one of those.)
#
! # $Header: /files/home/users/syd/elm.rel/RCS/Configure,v 4.1.1.10 90/10/07 21:31:35 syd Exp $
#
# Yes, you may rip this off to use in other distribution packages.
# (Note: this Configure script was generated automatically. Rather than
--- 8,14 ----
# and edit it to reflect your system. Some packages may include samples
# of config.h for certain machines, so you might look for one of those.)
#
! # $Header: /files/home/users/syd/elm.rel/RCS/Configure,v 4.1.1.11 90/10/24 16:37:01 syd Exp $
#
# Yes, you may rip this off to use in other distribution packages.
# (Note: this Configure script was generated automatically. Rather than
***************
*** 1689,1695 ****
esac
: see if we have to deal with yellow pages
! if $test -d /usr/etc/yp; then
if $test "$passcat" = "ypcat passwd"; then
dflt=y
elif $contains '^\+:' /etc/passwd; then
--- 1689,1695 ----
esac
: see if we have to deal with yellow pages
! if $test -d /usr/etc/yp || $test -d /etc/yp; then
if $test "$passcat" = "ypcat passwd"; then
dflt=y
elif $contains '^\+:' /etc/passwd; then
Index: Patchlist
*** ../elm2.3/Patchlist Sun Oct 7 21:55:02 1990
--- Patchlist Wed Dec 5 22:10:47 1990
***************
*** 1,3 ****
--- 1,51 ----
+ Elm 2.3 Patch 9 - More bug/portability fixes
+ Wed Dec 5 22:10:09 EST 1990 (Creation date, not posting date)
+ Add yp search to /etc/yp as well as /usr/etc/yp
+ From: Lee Ziegenhals
+
+ Remove start_highlight and end_highlight, no longer used
+ From: W. David Higgins
+
+ Add uninstall target to doc Makefile.SH
+ From: Rusty Haddock
+
+ Init time zone header to avoid garbage strings
+ From: Norman J. Meluch
+
+ Added FAILED_SAVE log case to filter utils.
+ Fixed out of order lines.
+ From: Steve Campbell
+
+ Remove opterr from newmail, unused and some getopts
+ dont define it.
+ From: Syd via Peter King
+
+ Fix arepdaem lock file creation flags, wrong modes left over
+ from open call
+ From: Syd via Terry Furman
+
+ Fix header end on reply due to white space continuation allowing
+ it to go too far.
+ From: Syd via report from Tom Davis <tdd@endure.cl.msu.edu>
+
+
+ Elm 2.3 Patch 8 - Important fix to Patch 7
+ Oct 10 13:02 EDT 1990 (Creation date, not posting date)
+ Please FOLKS, follow the 'After Patching Instructions', it'll save
+ us all alot of e-mail.....
+
+ This is the quickie patch to fix up a few things that PL7 didn't
+ do as cleanly as it should have.
+
+ Make the symbol submitflagss look less like a type, it is real.
+ From: Syd
+
+ Fix calling sequence to copy_message for new MMDF argument
+ From: Syd
+
+ Allow Priority: normal is upper or lower N (quickie fix)
+ From: Syd
+
Elm 2.3 Patch 7 - Misc bug fixes
Sun Oct 7 21:33:58 EDT 1990 (Creation date, not posting date)
Fixes when newmail detects that the mail folder has grown in size it prints a newline, even
Index: doc/Makefile.SH
Prereq: 4.1
*** ../elm2.3/doc/Makefile.SH Sat Apr 28 22:41:08 1990
--- doc/Makefile.SH Wed Oct 24 15:42:58 1990
***************
*** 16,22 ****
echo "Extracting doc/Makefile (with variable substitutions)"
cat >Makefile <<!GROK!THIS!
#
! # $Id: Makefile.SH,v 4.1 90/04/28 22:41:07 syd Exp $
#
# Makefile for the documentation of the ELM mail system
#
--- 16,22 ----
echo "Extracting doc/Makefile (with variable substitutions)"
cat >Makefile <<!GROK!THIS!
#
! # $Id: Makefile.SH,v 4.1.1.1 90/10/24 15:42:13 syd Exp $
#
# Makefile for the documentation of the ELM mail system
#
***************
*** 23,28 ****
--- 23,32 ----
# (C) Copyright 1989, 1990, USENET Community Trust
#
# $Log: Makefile.SH,v $
+ # Revision 4.1.1.1 90/10/24 15:42:13 syd
+ # Add uninstall target
+ # From: Rusty Haddock
+ #
# Revision 4.1 90/04/28 22:41:07 syd
# checkin of Elm 2.3 as of Release PL0
#
***************
*** 108,113 ****
--- 112,120 ----
clean:
install: $(LIB_LIST) $(MAN_LIST) $(MAN)/wnewmail.$(MANEXT)
+
+ uninstall:
+ $(RM) $(LIB_LIST) $(MAN_LIST) $(MAN)/wnewmail.$(MANEXT)
# Dependencies and rules for installing man pages and lib files
# taken from a remote system
Index: filter/filter.c
Prereq: 4.1
*** ../elm2.3/filter/filter.c Sat Apr 28 22:41:56 1990
--- filter/filter.c Wed Oct 24 16:11:54 1990
***************
*** 1,8 ****
! static char rcsid[] ="@(#)$Id: filter.c,v 4.1 90/04/28 22:41:55 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] ="@(#)$Id: filter.c,v 4.1.1.1 90/10/24 16:11:44 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: filter.c,v $
+ * Revision 4.1.1.1 90/10/24 16:11:44 syd
+ * Fix out of order lines
+ * From: Steve Campbell
+ *
* Revision 4.1 90/04/28 22:41:55 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 123,130 ****
if (summary || long_summary) {
if (get_filter_rules() == -1) {
- exit(1);
if (outfd != NULL) fclose(outfd);
}
show_summary();
if (outfd != NULL) fclose(outfd);
--- 127,134 ----
if (summary || long_summary) {
if (get_filter_rules() == -1) {
if (outfd != NULL) fclose(outfd);
+ exit(1);
}
show_summary();
if (outfd != NULL) fclose(outfd);
Index: filter/utils.c
Prereq: 4.1.1.1
*** ../elm2.3/filter/utils.c Thu Jul 12 23:35:17 1990
--- filter/utils.c Wed Oct 24 16:08:46 1990
***************
*** 1,8 ****
! static char rcsid[] ="@(#)$Id: utils.c,v 4.1.1.1 90/07/12 20:23:19 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] ="@(#)$Id: utils.c,v 4.1.1.2 90/10/24 16:08:29 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.2 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: utils.c,v $
+ * Revision 4.1.1.2 90/10/24 16:08:29 syd
+ * Add FAILED_SAVE case to log
+ * From: Steve Cambell
+ *
* Revision 4.1.1.1 90/07/12 20:23:19 syd
* patch fixes some minor typing mistakes in error messages
* From: hz247bi@duc220.uni-duisburg.de (Bieniek)
***************
*** 91,96 ****
--- 95,102 ----
switch (what) {
case DELETE_MSG : fprintf(fd, "\tDELETED"); break;
+ case FAILED_SAVE: fprintf(fd, "\tSAVE FAILED for file \"%s\"",
+ rules[rule_choosen].argument2); break;
case SAVE : fprintf(fd, "\tSAVED in file \"%s\"",
rules[rule_choosen].argument2); break;
case SAVECC : fprintf(fd,"\tSAVED in file \"%s\" AND PUT in mailbox",
Index: hdrs/elm.h
Prereq: 4.1
*** ../elm2.3/hdrs/elm.h Sat Apr 28 22:42:09 1990
--- hdrs/elm.h Wed Oct 24 15:33:06 1990
***************
*** 1,8 ****
! /* $Id: elm.h,v 4.1 90/04/28 22:42:08 syd Exp $ */
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! /* $Id: elm.h,v 4.1.1.1 90/10/24 15:31:24 syd Exp $ */
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: elm.h,v $
+ * Revision 4.1.1.1 90/10/24 15:31:24 syd
+ * Remove variables no longer used
+ * From: W. David Higgins
+ *
* Revision 4.1 90/04/28 22:42:08 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 96,104 ****
char up[SHORT], down[SHORT], /* cursor control seq's */
left[SHORT], right[SHORT];
int cursor_control = FALSE; /* cursor control avail? */
-
- char start_highlight[SHORT],
- end_highlight[SHORT]; /* stand out mode... */
int has_highlighting = FALSE; /* highlighting available? */
--- 100,105 ----
Index: hdrs/headers.h
Prereq: 4.1
*** ../elm2.3/hdrs/headers.h Sat Apr 28 22:42:12 1990
--- hdrs/headers.h Wed Oct 24 15:33:10 1990
***************
*** 1,8 ****
! /* $Id: headers.h,v 4.1 90/04/28 22:42:11 syd Exp $ */
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! /* $Id: headers.h,v 4.1.1.1 90/10/24 15:33:07 syd Exp $ */
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: headers.h,v $
+ * Revision 4.1.1.1 90/10/24 15:33:07 syd
+ * Remove variables no longer used
+ * From: W. David Higgins
+ *
* Revision 4.1 90/04/28 22:42:11 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 91,99 ****
left[SHORT],
right[SHORT]; /* cursor control seq's */
extern int cursor_control; /* cursor control avail? */
-
- extern char start_highlight[SHORT],
- end_highlight[SHORT]; /* standout mode... */
extern int has_highlighting; /* highlighting available? */
--- 95,100 ----
Index: src/init.c
Prereq: 4.1.1.2
*** ../elm2.3/src/init.c Wed Aug 15 23:51:32 1990
--- src/init.c Wed Dec 5 14:34:20 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: init.c,v 4.1.1.2 90/08/02 21:57:56 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.2 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: init.c,v 4.1.1.4 90/12/05 14:34:08 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.4 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,27 ----
*
*******************************************************************************
* $Log: init.c,v $
+ * Revision 4.1.1.4 90/12/05 14:34:08 syd
+ * fix dropping of unused vars, dropped to much
+ * From: Syd
+ *
+ * Revision 4.1.1.3 90/10/24 15:33:11 syd
+ * Remove variables no longer used
+ * From: W. David Higgins
+ *
* Revision 4.1.1.2 90/08/02 21:57:56 syd
* The newly introduced function 'stricmp' has a name conflict with a libc
* function under SunOS 4.1. Changed name to istrcmp.
***************
*** 369,389 ****
}
}
}
!
! strcpy(start_highlight, "->");
! end_highlight[0] = '\0';
!
! if (!arrow_cursor) { /* try to use inverse bar instead */
! if ((cp = return_value_of("so")) != NULL) {
! strcpy(start_highlight, cp);
! if ((cp = return_value_of("se")) == NULL)
! strcpy(start_highlight, "->");
! else {
! strcpy(end_highlight, cp);
has_highlighting = TRUE;
- }
- }
- }
}
/** clear the screen **/
--- 377,385 ----
}
}
}
! if (!arrow_cursor) /* try to use inverse bar instead */
! if (return_value_of("so") != NULL && return_value_of("se") != NULL)
has_highlighting = TRUE;
}
/** clear the screen **/
Index: src/newmbox.c
Prereq: 4.1.1.4
*** ../elm2.3/src/newmbox.c Wed Oct 10 13:11:14 1990
--- src/newmbox.c Wed Dec 5 15:08:51 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: newmbox.c,v 4.1.1.4 90/10/10 12:53:42 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.4 $ $State: Exp $
*
* Copyright (c) 1988, USENET Community Trust
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: newmbox.c,v 4.1.1.5 90/10/24 15:46:47 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.5 $ $State: Exp $
*
* Copyright (c) 1988, USENET Community Trust
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: newmbox.c,v $
+ * Revision 4.1.1.5 90/10/24 15:46:47 syd
+ * Init time zone variable to avoid garbage strings
+ * From: Norman J. Meluch
+ *
* Revision 4.1.1.4 90/10/10 12:53:42 syd
* allow words in either case
* quickie fix
***************
*** 480,485 ****
--- 484,490 ----
strcpy(current_header->subject, ""); /* clear subj */
strcpy(current_header->to, ""); /* clear to */
strcpy(current_header->mailx_status, ""); /* clear status flags */
+ strcpy(current_header->time_zone, ""); /* clear time zone name */
strcpy(current_header->messageid, "<no.id>"); /* set no id into message id */
current_header->encrypted = 0; /* clear encrypted */
current_header->exit_disposition = UNSET;
Index: src/returnadd.c
Prereq: 4.1
*** ../elm2.3/src/returnadd.c Sat Apr 28 22:43:55 1990
--- src/returnadd.c Wed Dec 5 22:34:13 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: returnadd.c,v 4.1 90/04/28 22:43:54 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: returnadd.c,v 4.1.1.2 90/12/05 22:33:58 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.2 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,28 ----
*
*******************************************************************************
* $Log: returnadd.c,v $
+ * Revision 4.1.1.2 90/12/05 22:33:58 syd
+ * Fix missing close brace due to indention error
+ * From: Syd
+ *
+ * Revision 4.1.1.1 90/12/05 21:59:41 syd
+ * Fix where header could be going past end on return due to line
+ * combination on header continuation.
+ * From: Syd via report from Tom Davis
+ *
* Revision 4.1 90/04/28 22:43:54 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 231,237 ****
char buf[SLEN], name1[SLEN], name2[SLEN], lastname[SLEN];
char hold_return[SLEN], alt_name2[SLEN], buf2[SLEN];
! int ok = 1, lines;
int using_to = FALSE;
/* now initialize all the char buffers [thanks Keith!] */
--- 240,246 ----
char buf[SLEN], name1[SLEN], name2[SLEN], lastname[SLEN];
char hold_return[SLEN], alt_name2[SLEN], buf2[SLEN];
! int ok = 1, lines, len_buf, len_buf2;
int using_to = FALSE;
/* now initialize all the char buffers [thanks Keith!] */
***************
*** 266,288 ****
buffer[0] = '\0';
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok)
! if(buf2[strlen(buf2)-1] == '\n') lines--; /* got a full line */
while (ok && lines) {
buf[0] = '\0';
strncat(buf, buf2, SLEN);
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok)
! if(buf2[strlen(buf2)-1] == '\n') lines--; /* got a full line */
! while (ok && lines && whitespace(buf2[0])) {
! if (buf[strlen(buf)-1] == '\n')
! buf[strlen(buf)-1] = '\0';
! strncat(buf, buf2, (SLEN-strlen(buf)-1));
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok)
! if(buf2[strlen(buf2)-1] == '\n') lines--; /* got a full line */
}
/* At this point, "buf" contains the unfolded header line, while "buf2" contains
the next single line of text from the mail file */
--- 275,306 ----
buffer[0] = '\0';
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok) {
! len_buf2 = strlen(buf2);
! if(buf2[len_buf2-1] == '\n') lines--; /* got a full line */
! }
while (ok && lines) {
buf[0] = '\0';
strncat(buf, buf2, SLEN);
+ len_buf = strlen(buf);
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok) {
! len_buf2 = strlen(buf2);
! if(buf2[len_buf2-1] == '\n') lines--; /* got a full line */
! }
! while (ok && lines && whitespace(buf2[0]) && len_buf >= 2) {
! if (buf[len_buf-1] == '\n') {
! len_buf--;
! buf[len_buf] = '\0';
! }
! strncat(buf, buf2, (SLEN-len_buf-1));
ok = (int) (fgets(buf2, SLEN, mailfile) != NULL);
! if (ok) {
! len_buf2 = strlen(buf2);
! if(buf2[len_buf2-1] == '\n') lines--; /* got a full line */
}
+ }
/* At this point, "buf" contains the unfolded header line, while "buf2" contains
the next single line of text from the mail file */
***************
*** 312,318 ****
#endif
! else if (strlen(buf) < 2) /* done with header */
lines = 0; /* let's get outta here! We're done!!! */
}
--- 330,336 ----
#endif
! else if (len_buf < 2) /* done with header */
lines = 0; /* let's get outta here! We're done!!! */
}
Index: utils/arepdaem.c
Prereq: 4.1.1.3
*** ../elm2.3/utils/arepdaem.c Sun Oct 7 21:55:00 1990
--- utils/arepdaem.c Wed Dec 5 15:13:06 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: arepdaem.c,v 4.1.1.3 90/10/07 20:39:31 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.3 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: arepdaem.c,v 4.1.1.4 90/12/05 15:12:52 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.4 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: arepdaem.c,v $
+ * Revision 4.1.1.4 90/12/05 15:12:52 syd
+ * Fix lock file flags, wrong mode flag used
+ * From: Syd via Terry Furman
+ *
* Revision 4.1.1.3 90/10/07 20:39:31 syd
* Added missing parens to an imbedded assignment.
* From: Phil Hochstetler <phil@sequent.com>
***************
*** 636,642 ****
return(0); /* file already exists */
#endif
! if ((create_fd=creat(lock_name, O_RDONLY)) == -1)
return(0); /* can't create file!! */
sprintf(pid_buffer,"%d\n", getpid() ); /* write the current pid to the file */
--- 640,646 ----
return(0); /* file already exists */
#endif
! if ((create_fd=creat(lock_name, 0444)) == -1)
return(0); /* can't create file!! */
sprintf(pid_buffer,"%d\n", getpid() ); /* write the current pid to the file */
Index: utils/newmail.c
Prereq: 4.1.1.2
*** ../elm2.3/utils/newmail.c Sun Oct 7 21:55:01 1990
--- utils/newmail.c Wed Dec 5 15:05:57 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: newmail.c,v 4.1.1.2 90/10/07 21:10:35 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.2 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: newmail.c,v 4.1.1.3 90/12/05 15:05:39 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.3 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,23 ----
*
*******************************************************************************
* $Log: newmail.c,v $
+ * Revision 4.1.1.3 90/12/05 15:05:39 syd
+ * Remove unused opterr variable, some getopts dont define it
+ * From: Syd via Peter King
+ *
* Revision 4.1.1.2 90/10/07 21:10:35 syd
* newmail did not correctly present sender name if the source
* of the mail is local from the system.
***************
*** 128,134 ****
char *argv[];
{
extern char *optarg;
! extern int optind, opterr;
char *ptr;
int c, i, done;
long lastsize,
--- 132,138 ----
char *argv[];
{
extern char *optarg;
! extern int optind;
char *ptr;
int c, i, done;
long lastsize,
***************
*** 147,153 ****
#endif /* PIDCHECK */ /* Then exit the program if PIDCHECK */
interval_time = DEFAULT_INTERVAL;
- opterr = 0;
/** let's see if the first character of the basename of the
command invoked is a 'w' (e.g. have we been called as
--- 151,156 ----
--
=====================================================================
Sydney S. Weinstein, CDP, CCP Elm Coordinator
Datacomp Systems, Inc. Voice: (215) 947-9900
syd@DSI.COM or dsinc!syd FAX: (215) 938-0235