home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
rtsi.com
/
2014.01.www.rtsi.com.tar
/
www.rtsi.com
/
OS9
/
OSK
/
APPS
/
elm.lzh
/
ELM
/
PATCH_1
< prev
next >
Wrap
Text File
|
1991-01-11
|
46KB
|
1,437 lines
diff -c -r elm.dist/config.h elm.new/config.h
*** elm.dist/config.h Sat Sep 15 14:45:00 1990
--- elm.new/config.h Tue Sep 11 20:27:00 1990
***************
*** 159,172 ****
/* CONFIGURE_DATE
* This symbol contains the last date that configure was run for elm -v output.
*/
! #define CONFIGURE_DATE "Fri Jun 29 19:23:57 1990"
/* ENABLE_CALENDAR:
* This symbol, if defined, indicates that the calendar feature
* should be supported.
*/
! /* #define ENABLE_CALENDAR /**/
! #define dflt_calendar_file "calendar"
/* NEED_CUSERID:
* This symbol, if defined, means to include our own cuserid().
--- 159,172 ----
/* CONFIGURE_DATE
* This symbol contains the last date that configure was run for elm -v output.
*/
! #define CONFIGURE_DATE "Tue Sep 11 20:20:32 1990"
/* ENABLE_CALENDAR:
* This symbol, if defined, indicates that the calendar feature
* should be supported.
*/
! #define ENABLE_CALENDAR /**/
! #define dflt_calendar_file ".calendar"
/* NEED_CUSERID:
* This symbol, if defined, means to include our own cuserid().
***************
*** 415,427 ****
* the /etc/passwd file in Berkeley format (name first thing, everything
* up to first comma, with & replaced by capitalized login id, yuck).
*/
/* USGNAMES:
* This symbol, if defined, indicates that full names are stored in
* the /etc/passwd file in USG format (everything after - and before ( is
* the name).
*/
#define PASSNAMES /* (undef to take name from ~/.fullname) */
! #define BERKNAMES /* (that is, ":name,stuff:") */
/* #define USGNAMES /* (that is, ":stuff-name(stuff):") */
/* XENIX:
--- 415,437 ----
* the /etc/passwd file in Berkeley format (name first thing, everything
* up to first comma, with & replaced by capitalized login id, yuck).
*/
+ /* OSKTOPNAMES:
+ * This symbol, if defined, indicates that full names are stored in
+ * the /etc/passwd file in OSK TOP format (name first thing, everything
+ * up to first colon, with & replaced by capitalized login id, yuck).
+ */
/* USGNAMES:
* This symbol, if defined, indicates that full names are stored in
* the /etc/passwd file in USG format (everything after - and before ( is
* the name).
+ *
+ * OSKTOPNAMES: OS-9/68k and TOP-Munich environment: use (and
+ * handle correctly) the user name from gecos-field
+ * in the password-file (Ralf Schuettau)
*/
#define PASSNAMES /* (undef to take name from ~/.fullname) */
! /* #define BERKNAMES /* (that is, ":name,stuff:") */
! #define OSKTOPNAMES /* (that is, "name:stuff:") */
/* #define USGNAMES /* (that is, ":stuff-name(stuff):") */
/* XENIX:
diff -c -r elm.dist/hdrs/defs.h elm.new/hdrs/defs.h
*** elm.dist/hdrs/defs.h Sat Sep 15 14:44:00 1990
--- elm.new/hdrs/defs.h Tue Sep 11 20:33:00 1990
***************
*** 37,43 ****
# define VERSION "2.3" /* Version number... */
! # define OVERSION "(OS-9 1.01)" /* my version number .. */
# define VERS_DATE "May 1, 1990" /* for elm -v option */
# define WHAT_STRING \
"@(#) Version 2.3, USENET supported version, released May 1990"
--- 37,43 ----
# define VERSION "2.3" /* Version number... */
! # define OVERSION "(OS-9 1.10)" /* my version number .. */
# define VERS_DATE "May 1, 1990" /* for elm -v option */
# define WHAT_STRING \
"@(#) Version 2.3, USENET supported version, released May 1990"
diff -c -r elm.dist/hdrs/patchlevel.h elm.new/hdrs/patchlevel.h
*** elm.dist/hdrs/patchlevel.h Sat Sep 15 14:41:00 1990
--- elm.new/hdrs/patchlevel.h Tue Sep 11 20:07:00 1990
***************
*** 1,1 ****
! #define PATCHLEVEL 4
--- 1,1 ----
! #define PATCHLEVEL 6
diff -c -r elm.dist/src/addr_util.c elm.new/src/addr_util.c
*** elm.dist/src/addr_util.c Sat Sep 15 14:47:00 1990
--- elm.new/src/addr_util.c Tue Sep 11 20:50:00 1990
***************
*** 161,168 ****
--- 161,183 ----
return(firstcp);
#else
+ #ifdef OSKTOPNAMES
+
+ char *lastcp;
+
+ /* The last character of the full name is the one preceding the first
+ * ':'. If there is no ':', then the full name ends at the end of the
+ * gcos field.
+ */
+
+ if(lastcp = index(gcos_field, ':'))
+ *lastcp = '\0';
+
+ return (gcos_field);
+ #else
/* use full gcos field */
return(gcos_field);
+ #endif
#endif
#endif
}
diff -c -r elm.dist/src/aliaslib.c elm.new/src/aliaslib.c
*** elm.dist/src/aliaslib.c Sat Sep 15 14:43:00 1990
--- elm.new/src/aliaslib.c Tue Sep 11 20:50:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: aliaslib.c,v 4.1.1.2 90/06/05 21:31:34 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: aliaslib.c,v 4.1.1.4 90/08/02 21:57:53 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,28 ----
*
*******************************************************************************
* $Log: aliaslib.c,v $
+ * Revision 4.1.1.4 90/08/02 21:57:53 syd
+ * The newly introduced function 'stricmp' has a name conflict with a libc
+ * function under SunOS 4.1. Changed name to istrcmp.
+ * From: scs@lokkur.dexter.mi.us (Steve Simmons)
+ *
+ * Revision 4.1.1.3 90/07/12 23:18:17 syd
+ * Make domain name checking case independent
+ * From: Syd, reported by Steven Baur
+ *
* Revision 4.1.1.2 90/06/05 21:31:34 syd
* Fix now spurious error message for alias recursive expansion
* when alias lookup is on a string over 20 chars long. If that
***************
*** 282,288 ****
loc = hash_it(word, size);
! while (stricmp(word, table[loc].name) != 0) {
if (table[loc].name[0] == '\0')
return(-1);
loc = (loc + 1) % size;
--- 291,297 ----
loc = hash_it(word, size);
! while (istrcmp(word, table[loc].name) != 0) {
if (table[loc].name[0] == '\0')
return(-1);
loc = (loc + 1) % size;
***************
*** 292,298 ****
}
int
! stricmp(s1,s2)
register char *s1, *s2;
{
/* case insensitive comparison */
--- 301,307 ----
}
int
! istrcmp(s1,s2)
register char *s1, *s2;
{
/* case insensitive comparison */
***************
*** 306,311 ****
--- 315,338 ----
++s2;
}
/*NOTREACHED*/
+ }
+
+ int
+ strincmp(s1,s2,n)
+ register char *s1, *s2;
+ register int n;
+ {
+ /* case insensitive comparison */
+ register int d;
+ while (--n >= 0) {
+ d = ( isupper(*s1) ? tolower(*s1) : *s1 )
+ - ( isupper(*s2) ? tolower(*s2) : *s2 ) ;
+ if ( d != 0 || *s1 == '\0' || *s2 == '\0' )
+ return d;
+ ++s1;
+ ++s2;
+ }
+ return(0);
}
int
diff -c -r elm.dist/src/curses.c elm.new/src/curses.c
*** elm.dist/src/curses.c Sat Sep 15 14:46:00 1990
--- elm.new/src/curses.c Tue Sep 11 20:50:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: curses.c,v 4.1.1.2 90/06/26 20:09:09 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: curses.c,v 4.1.1.3 90/07/12 20:18:02 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: curses.c,v $
+ * Revision 4.1.1.3 90/07/12 20:18:02 syd
+ * Be sure that output characters are not negative integers.
+ * From: tct!chip@uunet.UU.NET (Chip Salzenberg)
+ *
* Revision 4.1.1.2 90/06/26 20:09:09 syd
* Add 8 bit support via ascii_ctype
* From: Robert Claeson <prc@erbe.se>
***************
*** 653,658 ****
--- 657,663 ----
static int wrappedlastchar = 0;
register int justwrapped, nt;
+ ch &= 0xFF;
justwrapped = 0;
/* if return, just go to left column. */
diff -c -r elm.dist/src/domains.c elm.new/src/domains.c
*** elm.dist/src/domains.c Sat Sep 15 14:43:00 1990
--- elm.new/src/domains.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: domains.c,v 4.1 90/04/28 22:42:44 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: domains.c,v 4.1.1.1 90/07/12 23:19:14 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: domains.c,v $
+ * Revision 4.1.1.1 90/07/12 23:19:14 syd
+ * Make domain name checking case independent
+ * From: Syd, reported by Steven Baur
+ *
* Revision 4.1 90/04/28 22:42:44 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 184,190 ****
while (fgets(buffer, SLEN, domainfd) != NULL) {
if (buffer[0] == '#') /* skip comments */
continue;
! if (strncmp(buffer, mydomain, strlen(mydomain)) == 0) { /* match? */
matched++; /* Gotcha! Remember this momentous event! */
break;
}
--- 188,194 ----
while (fgets(buffer, SLEN, domainfd) != NULL) {
if (buffer[0] == '#') /* skip comments */
continue;
! if (strincmp(buffer, mydomain, strlen(mydomain)) == 0) { /* match? */
matched++; /* Gotcha! Remember this momentous event! */
break;
}
diff -c -r elm.dist/src/edit.c elm.new/src/edit.c
*** elm.dist/src/edit.c Sat Sep 15 14:42:00 1990
--- elm.new/src/edit.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: edit.c,v 4.1 90/04/28 22:42:46 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: edit.c,v 4.1.1.1 90/07/12 22:43:05 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,25 ----
*
*******************************************************************************
* $Log: edit.c,v $
+ * Revision 4.1.1.1 90/07/12 22:43:05 syd
+ * Make it aware of the fact that we loose the cursor position on
+ * some system calls, so set it far enough off an absolute move will
+ * be done on the next cursor address, and then place it where we want it.
+ * From: Syd, reported by Douglas Lamb
+ *
* Revision 4.1 90/04/28 22:42:46 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 78,83 ****
--- 84,90 ----
}
Raw(ON);
+ SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
if (folder_type == SPOOL) { /* uh oh... now the toughie... */
diff -c -r elm.dist/src/editmsg.c elm.new/src/editmsg.c
*** elm.dist/src/editmsg.c Sat Sep 15 14:46:00 1990
--- elm.new/src/editmsg.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: editmsg.c,v 4.1.1.2 90/06/21 21:14:09 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: editmsg.c,v 4.1.1.3 90/07/12 22:43:08 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,25 ----
*
*******************************************************************************
* $Log: editmsg.c,v $
+ * Revision 4.1.1.3 90/07/12 22:43:08 syd
+ * Make it aware of the fact that we loose the cursor position on
+ * some system calls, so set it far enough off an absolute move will
+ * be done on the next cursor address, and then place it where we want it.
+ * From: Syd, reported by Douglas Lamb
+ *
* Revision 4.1.1.2 90/06/21 21:14:09 syd
* Force Carriage return on return from editor, as column is lost
* From: Steve Cambell
***************
*** 99,105 ****
if (old_raw == ON)
Raw(ON);
! CarriageReturn(); /* don't know where we are, force col 0 */
if (cursor_control)
transmit_functions(ON); /* function keys are local */
--- 105,112 ----
if (old_raw == ON)
Raw(ON);
! SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
! MoveCursor(LINES, 0); /* dont know where we are, force last row, col 0 */
if (cursor_control)
transmit_functions(ON); /* function keys are local */
***************
*** 283,288 ****
--- 290,297 ----
sprintf(buffer, "~r %s%s.%d", temp_dir, temp_edit, getpid());
read_in_file(edit_fd, (char *) buffer + 3, 0);
(void) unlink((char *) buffer+3);
+ SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
+ MoveCursor(LINES, 0); /* and go to a known location, last row col 0 */
}
goto more_input;
***************
*** 295,300 ****
--- 304,311 ----
(void) system_call((char *) buffer+2, USER_SHELL, TRUE, TRUE);
if (old_raw == ON)
Raw(ON);
+ SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
+ MoveCursor(LINES, 0); /* and go to a known location, last row col 0 */
Write_to_screen(simple_continue, 0);
goto more_input;
diff -c -r elm.dist/src/init.c elm.new/src/init.c
*** elm.dist/src/init.c Sat Sep 15 14:44:00 1990
--- elm.new/src/init.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: init.c,v 4.1 90/04/28 22:43:15 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: 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
***************
*** 14,19 ****
--- 14,28 ----
*
*******************************************************************************
* $Log: init.c,v $
+ * 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.
+ * From: scs@lokkur.dexter.mi.us (Steve Simmons)
+ *
+ * Revision 4.1.1.1 90/07/12 23:19:17 syd
+ * Make domain name checking case independent
+ * From: Syd, reported by Steven Baur
+ *
* Revision 4.1 90/04/28 22:43:15 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 268,274 ****
hostlen = strlen(hostname);
domlen = strlen(hostdomain);
if (hostlen >= domlen) {
! if (strcmp(&hostname[hostlen - domlen], hostdomain) == 0)
strcpy(hostfullname, hostname);
else {
strcpy(hostfullname, hostname);
--- 277,283 ----
hostlen = strlen(hostname);
domlen = strlen(hostdomain);
if (hostlen >= domlen) {
! if (istrcmp(&hostname[hostlen - domlen], hostdomain) == 0)
strcpy(hostfullname, hostname);
else {
strcpy(hostfullname, hostname);
***************
*** 275,281 ****
strcat(hostfullname, hostdomain);
}
} else {
! if (strcmp(hostname, hostdomain + 1) == 0)
strcpy(hostfullname, hostname);
else {
strcpy(hostfullname, hostname);
--- 284,290 ----
strcat(hostfullname, hostdomain);
}
} else {
! if (istrcmp(hostname, hostdomain + 1) == 0)
strcpy(hostfullname, hostname);
else {
strcpy(hostfullname, hostname);
diff -c -r elm.dist/src/leavembox.c elm.new/src/leavembox.c
*** elm.dist/src/leavembox.c Sat Sep 15 14:46:00 1990
--- elm.new/src/leavembox.c Tue Sep 11 22:48:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: leavembox.c,v 4.1.1.3 90/06/21 22:51:52 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: leavembox.c,v 4.1.1.4 90/08/15 21:00:07 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: leavembox.c,v $
+ * Revision 4.1.1.4 90/08/15 21:00:07 syd
+ * Change elm to not delete empty folders on a resync
+ * From: Syd
+ *
* Revision 4.1.1.3 90/06/21 22:51:52 syd
* Add time.h to includes as some OSs include needed substructure only
* from time.h
***************
*** 454,465 ****
}
dprint(2, (debugfile, "\n\n"));
! } else if (folder_type == NON_SPOOL && !keep_empty_files) {
/* i.e. if no messages were to be kept and this is not a spool
* folder and we aren't keeping empty non-spool folders,
* simply remove the old original folder and that's it!
*/
(void)unlink(cur_folder);
return(1);
}
--- 458,470 ----
}
dprint(2, (debugfile, "\n\n"));
! } else if (folder_type == NON_SPOOL && !keep_empty_files && !resyncing) {
/* i.e. if no messages were to be kept and this is not a spool
* folder and we aren't keeping empty non-spool folders,
* simply remove the old original folder and that's it!
*/
+ fclose(mailfile); /* -hm (hint from hp...) */
(void)unlink(cur_folder);
return(1);
}
***************
*** 535,541 ****
/* link or copy complete - remove temp keep file */
unlink(temp_keep_file);
! } else if(folder_type == SPOOL || keep_empty_files) {
/* if this is an empty spool file, or if this is an empty non spool
* file and we keep empty non spool files (we always keep empty
--- 540,546 ----
/* link or copy complete - remove temp keep file */
unlink(temp_keep_file);
! } else if(folder_type == SPOOL || keep_empty_files || resyncing) {
/* if this is an empty spool file, or if this is an empty non spool
* file and we keep empty non spool files (we always keep empty
diff -c -r elm.dist/src/mailmsg2.c elm.new/src/mailmsg2.c
*** elm.dist/src/mailmsg2.c Sat Sep 15 14:47:00 1990
--- elm.new/src/mailmsg2.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: mailmsg2.c,v 4.1.1.4 90/06/26 16:18:24 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
--- 1,8 ----
! static char rcsid[] = "@(#)$Id: mailmsg2.c,v 4.1.1.7 90/08/15 22:02:36 syd Exp $";
/*******************************************************************************
! * The Elm Mail System - $Revision: 4.1.1.7 $ $State: Exp $
*
* Copyright (c) 1986, 1987 Dave Taylor
* Copyright (c) 1988, 1989, 1990 USENET Community Trust
***************
*** 14,19 ****
--- 14,36 ----
*
*******************************************************************************
* $Log: mailmsg2.c,v $
+ * Revision 4.1.1.7 90/08/15 22:02:36 syd
+ * deal with several of the problems that have come up trying to use the MMDF
+ * submit program directly rather than going through the sendmail stub
+ * included with MMDF. This should take care of the problem of not being
+ * able to send mail to usernames beginning with "i" and with the
+ * 'No valid author specified' problem.
+ * From: jac%brahms.tinton.ccur.com@RELAY.CS.NET
+ *
+ * Revision 4.1.1.6 90/07/12 23:19:20 syd
+ * Make domain name checking case independent
+ * From: Syd, reported by Steven Baur
+ *
+ * Revision 4.1.1.5 90/07/12 22:52:42 syd
+ * When Elm is compiled with the NO_XHEADER symbol defined, it failed
+ * to put a blank line between the message header and message body.
+ * From: mca@medicus.medicus.com (Mark Adams)
+ *
* Revision 4.1.1.4 90/06/26 16:18:24 syd
* Make it encode lines that are [...] if not one of the reserved lines.
* It was messing up decoding
***************
*** 365,372 ****
else
mailerflags[0] ='\0';
! quote_args(very_long_buffer, strip_parens(strip_commas(expanded_to)));
! strcpy(expanded_to, very_long_buffer);
/* sprintf(very_long_buffer,"( (%s %s %s ; %s %s) & ) < %s",
mailer, mailerflags, expanded_to,
--- 382,393 ----
else
mailerflags[0] ='\0';
! if (strcmp(submitmail, mailer) == 0)
! strcpy(expanded_to, " ");
! else {
! quote_args(very_long_buffer, strip_parens(strip_commas(expanded_to)));
! strcpy(expanded_to, very_long_buffer);
! }
/* sprintf(very_long_buffer,"( (%s %s %s ; %s %s) & ) < %s",
mailer, mailerflags, expanded_to,
***************
*** 672,677 ****
--- 693,701 ----
char buffer[SLEN];
int is_hidden_user; /* someone we should know about? */
#endif
+ #ifdef MMDF
+ int is_submit_mailer; /* using submit means change From: */
+ #endif /* MMDF */
char *get_arpa_date();
***************
*** 737,757 ****
fprintf(filedesc,"Date: %s\n", get_arpa_date());
#ifndef DONT_ADD_FROM
# ifdef SITE_HIDING
if (is_hidden_user)
fprintf(filedesc,"From: %s <%s!%s!%s>\n", full_username,
hostname, HIDDEN_SITE_NAME, username);
else
# else
# ifdef INTERNET
# ifdef USE_DOMAIN
! fprintf(filedesc,"From: %s <%s@%s>\n", full_username,
username, hostfullname);
# else
fprintf(filedesc,"From: %s <%s@%s>\n", full_username,
username, hostname);
# endif
# else
fprintf(filedesc,"From: %s <%s!%s>\n", full_username,
hostname, username);
# endif
--- 761,806 ----
fprintf(filedesc,"Date: %s\n", get_arpa_date());
#ifndef DONT_ADD_FROM
+ #ifdef MMDF
+ is_submit_mailer = (strcmp(submitmail,mailer) == 0);
+ #endif /* MMDF */
# ifdef SITE_HIDING
+ # ifdef MMDF
+ if (is_submit_mailer)
+ fprintf(filedesc,"From: %s <%s>\n", full_username, username);
+ else
+ # endif /* MMDF */
if (is_hidden_user)
fprintf(filedesc,"From: %s <%s!%s!%s>\n", full_username,
hostname, HIDDEN_SITE_NAME, username);
else
+ fprintf(filedesc,"From: %s <%s!%s>\n", full_username,
+ hostname, username);
# else
# ifdef INTERNET
# ifdef USE_DOMAIN
! # ifdef MMDF
! if (is_submit_mailer)
! fprintf(filedesc,"From: %s <%s>\n", full_username, username);
! else
! # endif /* MMDF */
! fprintf(filedesc,"From: %s <%s@%s>\n", full_username,
username, hostfullname);
# else
+ # ifdef MMDF
+ if (is_submit_mailer)
+ fprintf(filedesc,"From: %s <%s>\n", full_username, username);
+ else
+ # endif /* MMDF */
fprintf(filedesc,"From: %s <%s@%s>\n", full_username,
username, hostname);
# endif
# else
+ # ifdef MMDF
+ if (is_submit_mailer)
+ fprintf(filedesc,"From: %s <%s>\n", full_username, username);
+ else
+ # endif /* MMDF */
fprintf(filedesc,"From: %s <%s!%s>\n", full_username,
hostname, username);
# endif
***************
*** 788,796 ****
fprintf(filedesc, "Content-Type: mailform\n");
#ifndef NO_XHEADER
! fprintf(filedesc, "X-Mailer: ELM [version %s]\n\n", version_buff);
#endif /* !NO_XHEADER */
return((FILE *) filedesc);
}
--- 837,847 ----
fprintf(filedesc, "Content-Type: mailform\n");
#ifndef NO_XHEADER
! fprintf(filedesc, "X-Mailer: ELM [version %s]\n", version_buff);
#endif /* !NO_XHEADER */
+ putc('\n', filedesc);
+
return((FILE *) filedesc);
}
***************
*** 928,934 ****
sig = local_signature;
for (ptr = index(expanded_to,'@'); ptr; /* check To: list */
ptr = index(ptr+1,'@')) {
! if (strncmp(ptr,sitename,len) != 0
|| (*(ptr+len) != ',' && *(ptr+len) != 0
&& *(ptr+len) != ' ')) {
sig = remote_signature;
--- 979,985 ----
sig = local_signature;
for (ptr = index(expanded_to,'@'); ptr; /* check To: list */
ptr = index(ptr+1,'@')) {
! if (strincmp(ptr,sitename,len) != 0
|| (*(ptr+len) != ',' && *(ptr+len) != 0
&& *(ptr+len) != ' ')) {
sig = remote_signature;
***************
*** 938,944 ****
if (sig == local_signature) /* still local? */
for (ptr = index(expanded_cc,'@'); ptr; /* check Cc: */
ptr = index(ptr+1,'@')) {
! if (strncmp(ptr,sitename,len) != 0
|| (*(ptr+len) != ',' && *(ptr+len) != 0
&& *(ptr+len) != ' ')) {
sig = remote_signature;
--- 989,995 ----
if (sig == local_signature) /* still local? */
for (ptr = index(expanded_cc,'@'); ptr; /* check Cc: */
ptr = index(ptr+1,'@')) {
! if (strincmp(ptr,sitename,len) != 0
|| (*(ptr+len) != ',' && *(ptr+len) != 0
&& *(ptr+len) != ' ')) {
sig = remote_signature;
diff -c -r elm.dist/src/opt_utils.c elm.new/src/opt_utils.c
*** elm.dist/src/opt_utils.c Sat Sep 15 14:43:00 1990
--- elm.new/src/opt_utils.c Tue Sep 11 20:51:00 1990
***************
*** 107,112 ****
--- 107,115 ----
if (size < 2)
return -1;
+ #ifdef OSK
+ if ( ! info_str( "hostdomain" , buf , sizeof(buf) ) )
+ #endif
if ((fp = fopen(hostdomfile, "r")) != 0) {
fgets(buf, sizeof(buf) - 1, fp);
fclose(fp);
diff -c -r elm.dist/src/quit.c elm.new/src/quit.c
*** elm.dist/src/quit.c Sat Sep 15 14:42:00 1990
--- elm.new/src/quit.c Tue Sep 11 20:59:00 1990
***************
*** 115,135 ****
if(!*helpmsg) { /* format helpmsg if not yet done */
strcpy(helpmsg,
! "\l\r\l\rEnter: <nothing> to not change to a new folder,");
strcat(helpmsg,
! "\l\r '!' to change to your incoming mailbox (");
strcat(helpmsg, defaultfile);
strcat(helpmsg,
! ")\l\r '>' to change to your \"received\" folder (");
strcat(helpmsg, nameof(recvd_mail));
strcat(helpmsg,
! ")\l\r '<' to change to your \"sent\" folder (");
strcat(helpmsg, nameof(sent_mail));
! strcat(helpmsg, ")\l\r or a filename");
strcat(helpmsg,
! " (leading '=' denotes your folder directory ");
strcat(helpmsg, folders);
! strcat(helpmsg, ").\l\r");
}
list_folders(4, helpmsg);
PutLine0(LINES-2,0,"Change to which folder: "); /* reprompt */
--- 115,135 ----
if(!*helpmsg) { /* format helpmsg if not yet done */
strcpy(helpmsg,
! "\n\nEnter: <nothing> to not change to a new folder,");
strcat(helpmsg,
! "\n '!' to change to your incoming mailbox (");
strcat(helpmsg, defaultfile);
strcat(helpmsg,
! ")\n '>' to change to your \"received\" folder (");
strcat(helpmsg, nameof(recvd_mail));
strcat(helpmsg,
! ")\n '<' to change to your \"sent\" folder (");
strcat(helpmsg, nameof(sent_mail));
! strcat(helpmsg, ")\n or a filename");
strcat(helpmsg,
! "\n (leading '=' denotes your folder directory ");
strcat(helpmsg, folders);
! strcat(helpmsg, ").\n");
}
list_folders(4, helpmsg);
PutLine0(LINES-2,0,"Change to which folder: "); /* reprompt */
diff -c -r elm.dist/src/showmsg.c elm.new/src/showmsg.c
*** elm.dist/src/showmsg.c Sat Sep 15 14:45:00 1990
--- elm.new/src/showmsg.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: showmsg.c,v 4.1 90/04/28 22:44:06 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: showmsg.c,v 4.1.1.1 90/07/12 23:04:26 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,24 ----
*
*******************************************************************************
* $Log: showmsg.c,v $
+ * Revision 4.1.1.1 90/07/12 23:04:26 syd
+ * Fix MMDF case, where MSG_SEPERATOR has newline, buffer check
+ * didnt, thus it didnt detect the MSG_SEPERATOR.
+ * From: jbwaters@bsu-cs.bsu.edu (J. Brian Waters)
+ *
* Revision 4.1 90/04/28 22:44:06 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 466,481 ****
a command other than continuing with the display (only possible
with the builtin pager), otherwise 0. **/
#ifdef MMDF
if (strcmp(buffer, MSG_SEPERATOR) == 0)
! strcpy(buffer," ");
#endif /* MMDF */
if (builtin) {
- strcat(buffer, "\n");
return(display_line(buffer));
}
errno = 0;
! fprintf(pipe_wr_fp, "%s\n", buffer);
if (errno != 0)
dprint(1, (debugfile, "\terror %s hit!\n", error_name(errno)));
return(0);
--- 471,486 ----
a command other than continuing with the display (only possible
with the builtin pager), otherwise 0. **/
+ strcat(buffer, "\n");
#ifdef MMDF
if (strcmp(buffer, MSG_SEPERATOR) == 0)
! return(0); /* no reason to show the ending terminator */
#endif /* MMDF */
if (builtin) {
return(display_line(buffer));
}
errno = 0;
! fprintf(pipe_wr_fp, "%s", buffer);
if (errno != 0)
dprint(1, (debugfile, "\terror %s hit!\n", error_name(errno)));
return(0);
diff -c -r elm.dist/src/strings.c elm.new/src/strings.c
*** elm.dist/src/strings.c Sat Sep 15 14:45:00 1990
--- elm.new/src/strings.c Tue Sep 11 20:51:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: strings.c,v 4.1.1.2 90/06/21 22:45:06 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: strings.c,v 4.1.1.3 90/08/15 21:48:07 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,24 ----
*
*******************************************************************************
* $Log: strings.c,v $
+ * Revision 4.1.1.3 90/08/15 21:48:07 syd
+ * the user's (unmodified) limit criteria was being compared w/
+ * the lower-case version of the header contents.
+ * From: dwolfe@earth.sps.mot.com (Dave Wolfe)
+ *
* Revision 4.1.1.2 90/06/21 22:45:06 syd
* Make display not show To user if user is also sender
* From: Marius Olafsson
***************
*** 364,372 ****
for (; *buffer && ! whitespace(*buffer); buffer++, first++)
if (islower(*buffer))
- *first = tolower(*buffer);
- else
*first = *buffer;
*first = '\0';
--- 369,377 ----
for (; *buffer && ! whitespace(*buffer); buffer++, first++)
if (islower(*buffer))
*first = *buffer;
+ else
+ *first = tolower(*buffer);
*first = '\0';
***************
*** 374,382 ****
for (; *buffer; buffer++, rest++)
if (islower(*buffer))
- *rest = tolower(*buffer);
- else
*rest = *buffer;
*rest = '\0';
--- 379,387 ----
for (; *buffer; buffer++, rest++)
if (islower(*buffer))
*rest = *buffer;
+ else
+ *rest = tolower(*buffer);
*rest = '\0';
diff -c -r elm.dist/src/syscall.c elm.new/src/syscall.c
*** elm.dist/src/syscall.c Sat Sep 15 14:43:00 1990
--- elm.new/src/syscall.c Tue Sep 11 21:04:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: syscall.c,v 4.1.1.3 90/06/21 22:48:17 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: syscall.c,v 4.1.1.4 90/07/12 22:41:55 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,25 ----
*
*******************************************************************************
* $Log: syscall.c,v $
+ * Revision 4.1.1.4 90/07/12 22:41:55 syd
+ * Make it aware of the fact that we loose the cursor position on
+ * some system calls, so set it far enough off an absolute move will
+ * be done on the next cursor address, and then place it where we want it.
+ * From: Syd, reported by Douglas Lamb
+ *
* Revision 4.1.1.3 90/06/21 22:48:17 syd
* patch to fix up the Log headers.
* From: pdc%lunch.wpd@sgi.com (Paul Close)
***************
*** 88,93 ****
--- 94,100 ----
ret = system_call(command, USER_SHELL, TRUE, TRUE);
umask(077); /* now put it back to private for mail files */
+ SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
PutLine0(LINES, 0, "\n\nPress any key to return to ELM: ");
Raw(ON);
/* (void) getchar(); */
***************
*** 142,147 ****
--- 149,155 ----
ret = system_call(buffer, USER_SHELL, TRUE, TRUE);
+ SetXYLocation(0, 40); /* a location not near the next request, so an absolute is used */
PutLine0(LINES, 0, "\n\nPress any key to return to ELM.");
if (old_raw == ON)
Raw(ON);
***************
*** 247,257 ****
MoveCursor(LINES, 0);
if(helpmsg)
printf(helpmsg);
! sprintf(buffer, "chd %s;dir -e", folders);
! printf("\l\rContents of your folder directory:\l\r\l\r");
system_call(buffer, SH, FALSE, FALSE);
while(numlines--)
! printf("\l\r");
Raw(ON);
}
--- 255,265 ----
MoveCursor(LINES, 0);
if(helpmsg)
printf(helpmsg);
! sprintf(buffer, "chd %s;dir ", folders);
! printf("\nContents of your folder directory:\n\n");
system_call(buffer, SH, FALSE, FALSE);
while(numlines--)
! printf("\n");
Raw(ON);
}
diff -c -r elm.dist/utils/arepdaem.c elm.new/utils/arepdaem.c
*** elm.dist/utils/arepdaem.c Sat Sep 15 14:45:00 1990
--- elm.new/utils/arepdaem.c Tue Sep 11 20:07:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: arepdaem.c,v 4.1 90/04/28 22:44:33 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: arepdaem.c,v 4.1.1.2 90/08/15 22:50:14 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: arepdaem.c,v $
+ * Revision 4.1.1.2 90/08/15 22:50:14 syd
+ * Fix last size to time call
+ * From: Syd
+ *
+ * Revision 4.1.1.1 90/08/15 22:33:54 syd
+ * Fix to use time instead of bytes for changes to file and to process
+ * each entry on delete properly
+ * From: Denis Lambot <d241s016!lde@swn.siemens.be>
+ *
* Revision 4.1 90/04/28 22:44:33 syd
* checkin of Elm 2.3 as of Release PL0
*
***************
*** 93,104 ****
} reply_table[MAX_PEOPLE];
FILE *logfd; /* logfile (log action) */
! long autoreply_size = 0L; /* size of autoreply file */
int active = 0; /* # of people 'enrolled' */
FILE *open_logfile(); /* forward declaration */
long bytes(); /* ditto */
#ifdef VOIDSIG
void term_signal();
--- 102,114 ----
} reply_table[MAX_PEOPLE];
FILE *logfd; /* logfile (log action) */
! time_t autoreply_time = 0L; /* modif date of autoreply file */
int active = 0; /* # of people 'enrolled' */
FILE *open_logfile(); /* forward declaration */
long bytes(); /* ditto */
+ time_t ModTime(); /* ditto */
#ifdef VOIDSIG
void term_signal();
***************
*** 110,115 ****
--- 120,126 ----
{
long size;
int person, data_changed;
+ time_t time;
if (fork()) exit(0);
***************
*** 133,141 ****
/* 1. check to see if autoreply table has changed.. */
! if ((size = bytes(autoreply_file)) != autoreply_size) {
read_autoreply_file();
! autoreply_size = size;
}
/* 2. now for each active person... */
--- 144,152 ----
/* 1. check to see if autoreply table has changed.. */
! if ((time = ModTime(autoreply_file)) != autoreply_time) {
read_autoreply_file();
! autoreply_time = time;
}
/* 2. now for each active person... */
***************
*** 169,175 ****
int
read_autoreply_file()
{
! /** We're here because the autoreply file has changed size!! It
could either be because someone has been added or because
someone has been removed...since the list will always be in
order (nice, eh?) we should have a pretty easy time of it...
--- 180,186 ----
int
read_autoreply_file()
{
! /** We're here because the autoreply file has changed!! It
could either be because someone has been added or because
someone has been removed...since the list will always be in
order (nice, eh?) we should have a pretty easy time of it...
***************
*** 217,226 ****
/** now check to see if anyone has been removed... **/
! for (person = 0; person < active; person++)
! if (reply_table[person].in_list == 0) {
! log("removing %s from the active list",
! reply_table[person].username);
strcpy(reply_table[person].username,
reply_table[active-1].username);
strcpy(reply_table[person].mailfile,
--- 228,241 ----
/** now check to see if anyone has been removed... **/
! person = 0;
! while (person < active)
! if (reply_table[person].in_list) {
! person++;
! }
! else {
! log("removing %s from the active list",
! reply_table[person].username);
strcpy(reply_table[person].username,
reply_table[active-1].username);
strcpy(reply_table[person].mailfile,
***************
*** 253,259 ****
fclose(file);
/* printf("updated autoreply file\n"); */
! autoreply_size = bytes(autoreply_file);
}
int
--- 268,274 ----
fclose(file);
/* printf("updated autoreply file\n"); */
! autoreply_time = ModTime(autoreply_file);
}
int
***************
*** 462,467 ****
--- 477,504 ----
ok = 0;
return(ok ? buffer.st_size : 0);
+ }
+
+ time_t
+ ModTime(name)
+ char *name;
+ {
+ /** return the modification time in the specified file.
+ This is to check to see if autoreply has changed.... **/
+
+ int ok = 1;
+ extern int errno; /* system error number! */
+ struct stat buffer;
+
+ if (stat(name, &buffer) != 0)
+ if (errno != 2) {
+ unlock();
+ exit(fprintf(stderr,"Error %d attempting fstat on %s", errno, name));
+ }
+ else
+ ok = 0;
+
+ return(ok ? buffer.st_mtime : (time_t) 0);
}
mail(to, subject, filename, person)
diff -c -r elm.dist/utils/makefile elm.new/utils/makefile
*** elm.dist/utils/makefile Sat Sep 15 14:41:00 1990
--- elm.new/utils/makefile Sat Jun 30 15:01:00 1990
***************
*** 43,51 ****
READMSG_OBJ = readmsg.r expand.r ../../src/rels/opt_utils.r ../../src/rels/string2.r
- all: newalias readmsg
- touch all
-
newalias: newalias.r
chd $(RDIR); $(CC) $(LFLAGS) -f=newalias $(NEWALIAS_OBJ) $(LIB)
--- 43,48 ----
diff -c -r elm.dist/utils/newalias.c elm.new/utils/newalias.c
*** elm.dist/utils/newalias.c Sat Sep 15 14:46:00 1990
--- elm.new/utils/newalias.c Tue Sep 11 20:08:00 1990
***************
*** 1,8 ****
! static char rcsid[] = "@(#)$Id: newalias.c,v 4.1.1.1 90/06/05 21:11:20 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: newalias.c,v 4.1.1.2 90/08/02 21:57: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,24 ----
*
*******************************************************************************
* $Log: newalias.c,v $
+ * Revision 4.1.1.2 90/08/02 21:57:58 syd
+ * The newly introduced function 'stricmp' has a name conflict with a libc
+ * function under SunOS 4.1. Changed name to istrcmp.
+ * From: scs@lokkur.dexter.mi.us (Steve Simmons)
+ *
* Revision 4.1.1.1 90/06/05 21:11:20 syd
* alias command in ELM2.3 fails because of the wrong sized aliases.hash
* newalias did not truncate existing file (aliases.hash)
***************
*** 408,414 ****
loc = hash_it(word, size);
! while (table[loc].name[0] != '\0' && stricmp(table[loc].name,word) != 0)
loc = (loc + 1) % size;
if (table[loc].name[0] == '\0') {
--- 413,419 ----
loc = hash_it(word, size);
! while (table[loc].name[0] != '\0' && istrcmp(table[loc].name,word) != 0)
loc = (loc + 1) % size;
if (table[loc].name[0] == '\0') {
***************
*** 421,427 ****
}
int
! stricmp(s1,s2)
register char *s1, *s2;
{
/* case insensitive comparison */
--- 426,432 ----
}
int
! istrcmp(s1,s2)
register char *s1, *s2;
{
/* case insensitive comparison */
***************
*** 534,544 ****
if (hash_table_loaded || is_system) {
loc = hash_it(name, MAX_SALIASES);
! while (stricmp(name, shash_table[loc].name) != 0 &&
shash_table[loc].name[0] != '\0')
loc = (loc + 1) % MAX_SALIASES;
! if (stricmp(name, shash_table[loc].name) == 0)
return(1); /* found it! */
}
--- 539,549 ----
if (hash_table_loaded || is_system) {
loc = hash_it(name, MAX_SALIASES);
! while (istrcmp(name, shash_table[loc].name) != 0 &&
shash_table[loc].name[0] != '\0')
loc = (loc + 1) % MAX_SALIASES;
! if (istrcmp(name, shash_table[loc].name) == 0)
return(1); /* found it! */
}
***************
*** 545,555 ****
if (! is_system) { /* okay! Let's check the user alias file! */
loc = hash_it(name, MAX_UALIASES);
! while (stricmp(name, uhash_table[loc].name) != 0 &&
uhash_table[loc].name[0] != '\0')
loc = (loc + 1) % MAX_UALIASES;
! if (stricmp(name, uhash_table[loc].name) == 0)
return(1); /* found it! */
}
--- 550,560 ----
if (! is_system) { /* okay! Let's check the user alias file! */
loc = hash_it(name, MAX_UALIASES);
! while (istrcmp(name, uhash_table[loc].name) != 0 &&
uhash_table[loc].name[0] != '\0')
loc = (loc + 1) % MAX_UALIASES;
! if (istrcmp(name, uhash_table[loc].name) == 0)
return(1); /* found it! */
}