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_2
< prev
next >
Wrap
Text File
|
1993-03-18
|
20KB
|
820 lines
diff -crw elm/HDRS/defs.h elm_new/HDRS/defs.h
*** elm/HDRS/defs.h Thu Jan 10 19:25:00 1991
--- elm_new/HDRS/defs.h Wed Mar 17 14:32:00 1993
***************
*** 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"
--- 37,43 ----
# define VERSION "2.3" /* Version number... */
! # define OVERSION "(OS-9 1.11)" /* 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"
***************
*** 354,359 ****
--- 354,360 ----
# endif
#endif
+ /*
char *argv_zero();
char *bounce_off_remote();
char *ctime();
***************
*** 388,390 ****
--- 389,392 ----
long lseek();
long times();
long ulimit();
+ */
diff -crw elm/HDRS/sysdefs.h elm_new/HDRS/sysdefs.h
*** elm/HDRS/sysdefs.h Fri Aug 3 22:32:00 1990
--- elm_new/HDRS/sysdefs.h Wed Jan 27 10:45:00 1993
***************
*** 1,3 ****
--- 1,5 ----
+ #ifndef ___SYSDEFS_H_
+ #define ___SYSDEFS_H_
/* $Id: sysdefs.SH,v 4.1.1.1 90/06/09 22:28:42 syd Exp $ */
/*******************************************************************************
* The Elm Mail System - $Revision: 4.1.1.1 $ $State: Exp $
***************
*** 113,120 ****
#define remove_cmd "del " /* how to remove a file */
#define cat "/h0/usr/cmds/cat" /* how to display files */
#define sed_cmd "/h0/usr/cmds/sed" /* how to access sed */
! #define move_cmd "rename" /* how to move a file */
#define uuname "uuname" /* how to get a uuname */
#define MSG_SEPERATOR "\001\001\001\001\n" /* mmdf message seperator */
--- 115,123 ----
#define remove_cmd "del " /* how to remove a file */
#define cat "/h0/usr/cmds/cat" /* how to display files */
#define sed_cmd "/h0/usr/cmds/sed" /* how to access sed */
! #define move_cmd "/h0/usr/cmds/mv" /* how to move a file */
#define uuname "uuname" /* how to get a uuname */
#define MSG_SEPERATOR "\001\001\001\001\n" /* mmdf message seperator */
+ #endif
diff -crw elm/SRC/curses.c elm_new/SRC/curses.c
*** elm/SRC/curses.c Thu Jan 10 19:34:00 1991
--- elm_new/SRC/curses.c Thu Mar 11 19:33:00 1993
***************
*** 261,267 ****
tputs(_transmit_on, 1, outchar);
else
tputs(_transmit_off, 1, outchar);
! /* fflush(stdout); /* clear the output buffer */
}
}
--- 261,267 ----
tputs(_transmit_on, 1, outchar);
else
tputs(_transmit_off, 1, outchar);
! fflush(stdout); /* clear the output buffer */
}
}
***************
*** 323,329 ****
return(-1);
tputs(_clearscreen, 1, outchar);
! /* fflush(stdout); /* clear the output buffer */
return(0);
}
--- 323,329 ----
return(-1);
tputs(_clearscreen, 1, outchar);
! fflush(stdout); /* clear the output buffer */
return(0);
}
***************
*** 339,345 ****
while (n-- > 0)
tputs(_up, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 339,345 ----
while (n-- > 0)
tputs(_up, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 356,362 ****
while (n-- > 0)
tputs(_down, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 356,362 ----
while (n-- > 0)
tputs(_down, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 373,379 ****
while (n-- > 0)
tputs(_left, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 373,379 ----
while (n-- > 0)
tputs(_left, 1, outchar);
! fflush(stdout);/* */
return(0);
}
***************
*** 390,396 ****
while (n-- > 0)
tputs(_right, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 390,396 ----
while (n-- > 0)
tputs(_right, 1, outchar);
! fflush(stdout);/* */
return(0);
}
***************
*** 403,409 ****
stuff = tgoto(_moveto, col, row);
tputs(stuff, 1, outchar);
! /* fflush(stdout); */
}
MoveCursor(row, col)
--- 403,409 ----
stuff = tgoto(_moveto, col, row);
tputs(stuff, 1, outchar);
! fflush(stdout);/* */
}
MoveCursor(row, col)
***************
*** 450,456 ****
if (_col != 0)
outchar('\r');
outchar('\l');
! /* fflush(stdout); */
}
else if (col == _col && abs(row - _line) < 5) {
if (row < _line && _up)
--- 450,456 ----
if (_col != 0)
outchar('\r');
outchar('\l');
! fflush(stdout);/* */
}
else if (col == _col && abs(row - _line) < 5) {
if (row < _line && _up)
***************
*** 497,503 ****
return(-1);
tputs(_setbold, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 497,503 ----
return(-1);
tputs(_setbold, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 510,516 ****
return(-1);
tputs(_clearbold, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 510,516 ----
return(-1);
tputs(_clearbold, 1, outchar);
! fflush(stdout);/* */
return(0);
}
***************
*** 524,530 ****
return(-1);
tputs(_setunderline, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 524,530 ----
return(-1);
tputs(_setunderline, 1, outchar);
! fflush(stdout);/* */
return(0);
}
***************
*** 537,543 ****
return(-1);
tputs(_clearunderline, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 537,543 ----
return(-1);
tputs(_clearunderline, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 550,556 ****
return(-1);
tputs(_sethalfbright, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 550,556 ----
return(-1);
tputs(_sethalfbright, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 562,568 ****
return(-1);
tputs(_clearhalfbright, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 562,568 ----
return(-1);
tputs(_clearhalfbright, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 574,580 ****
return(-1);
tputs(_setinverse, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 574,580 ----
return(-1);
tputs(_setinverse, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 587,593 ****
return(-1);
tputs(_clearinverse, 1, outchar);
! /* fflush(stdout); */
return(0);
}
--- 587,593 ----
return(-1);
tputs(_clearinverse, 1, outchar);
! fflush(stdout);/**/
return(0);
}
***************
*** 622,628 ****
LINES -= _line; /* we can't use this for scrolling */
tputs(_set_memlock, 1, outchar);
! /* fflush(stdout); */
_memory_locked = TRUE;
}
--- 622,628 ----
LINES -= _line; /* we can't use this for scrolling */
tputs(_set_memlock, 1, outchar);
! fflush(stdout);/**/
_memory_locked = TRUE;
}
***************
*** 641,647 ****
LINES = _old_LINES; /* back to old setting */
tputs(_clear_memlock, 1, outchar);
! /* fflush(stdout); */
_memory_locked = FALSE;
}
return(0);
--- 641,647 ----
LINES = _old_LINES; /* back to old setting */
tputs(_clear_memlock, 1, outchar);
! fflush(stdout);/**/
_memory_locked = FALSE;
}
return(0);
***************
*** 735,741 ****
}
wrappedlastchar = justwrapped;
! /* fflush(stdout); */
return(0);
}
--- 735,741 ----
}
wrappedlastchar = justwrapped;
! fflush(stdout);/**/
return(0);
}
***************
*** 775,781 ****
MoveCursor(x,y);
while(*line)
Writechar(*line++);
! /* fflush(stdout); */
}
/*VARARGS2*/
--- 775,781 ----
MoveCursor(x,y);
while(*line)
Writechar(*line++);
! fflush(stdout);/**/
}
/*VARARGS2*/
***************
*** 834,840 ****
return(-1);
tputs(_cleartoeoln, 1, outchar);
! /* fflush(stdout); /* clear the output buffer */
return(0);
}
--- 834,840 ----
return(-1);
tputs(_cleartoeoln, 1, outchar);
! fflush(stdout); /* clear the output buffer */
return(0);
}
***************
*** 846,852 ****
return(-1);
tputs(_cleartoeos, 1, outchar);
! /* fflush(stdout); /* clear the output buffer */
return(0);
}
--- 846,852 ----
return(-1);
tputs(_cleartoeos, 1, outchar);
! fflush(stdout); /* clear the output buffer */
return(0);
}
***************
*** 915,919 ****
/** output the given character. From tputs... **/
/** Note: this CANNOT be a macro! **/
! write(fileno(stdout),&c,1);
}
--- 915,919 ----
/** output the given character. From tputs... **/
/** Note: this CANNOT be a macro! **/
! fwrite(&c, 1, 1, stdout);
}
diff -crw elm/SRC/makefile elm_new/SRC/makefile
*** elm/SRC/makefile Thu Jan 10 19:34:00 1991
--- elm_new/SRC/makefile Thu Mar 11 19:33:00 1993
***************
*** 9,16 ****
#
#---------------------------------------------------------------------------
! CCFLAGS = -k0l -ixt=/dd/tmp
! LFLAGS = -m=30 -k0l -ixt=/dd/tmp
LIB = -l=/h0/lib/os9lib.l -l=/h0/lib/termlib.l
RDIR = RELS
DEBUG = -DDEBUG
--- 9,17 ----
#
#---------------------------------------------------------------------------
! G = -g
! CCFLAGS = -k0l -ixt=/dd/tmp $G
! LFLAGS = -m=30 -k0l -ixt=/dd/tmp $G
LIB = -l=/h0/lib/os9lib.l -l=/h0/lib/termlib.l
RDIR = RELS
DEBUG = -DDEBUG
***************
*** 54,69 ****
chd rels;merge -b=100 $(LIBEL2) >+elmlib.r
chd rels;cc $(LFLAGS) -f=elm elm.r elmlib.r osk.r $(LIB)
-
- $(INCLDIR)/defs.h: $(INCLDIR)/../config.h $(INCLDIR)/sysdefs.h
- touch $(INCLDIR)/defs.h
-
- $(INCLDIR)/elm.h: $(INCLDIR)/curses.h $(INCLDIR)/defs.h
- touch $(INCLDIR)/elm.h
-
- $(INCLDIR)/headers.h: $(INCLDIR)/curses.h $(INCLDIR)/defs.h
- touch $(INCLDIR)/headers.h
-
addr_util.r: $(INCLDIR)/headers.h
alias.r: $(INCLDIR)/headers.h
aliasdb.r: $(INCLDIR)/headers.h
--- 55,60 ----
***************
*** 122,124 ****
--- 113,126 ----
syscall.r: $(INCLDIR)/headers.h
utils.r: $(INCLDIR)/headers.h
validname.r: $(INCLDIR)/defs.h
+
+ $(INCLDIR)/elm.h: $(INCLDIR)/curses.h $(INCLDIR)/defs.h
+ touch $(INCLDIR)/elm.h
+
+ $(INCLDIR)/headers.h: $(INCLDIR)/curses.h $(INCLDIR)/defs.h
+ touch $(INCLDIR)/headers.h
+
+ $(INCLDIR)/defs.h: $(INCLDIR)/../config.h $(INCLDIR)/sysdefs.h
+ touch $(INCLDIR)/defs.h
+
+
diff -crw elm/SRC/syscall.c elm_new/SRC/syscall.c
*** elm/SRC/syscall.c Thu Jan 10 19:34:00 1991
--- elm_new/SRC/syscall.c Thu Mar 11 19:33:00 1993
***************
*** 332,338 ****
}
strcpy(result, findmod(sh,""));
! strcat(result, " -c \"");
strcat(result, string);
strcat(result, "\"");
--- 332,340 ----
}
strcpy(result, findmod(sh,""));
! if (strcmp(result,"shell") != 0)
! strcat(result," -c");
! strcat(result, " \"");
strcat(result, string);
strcat(result, "\"");
diff -crw elm/UTILS/arepdaem.c elm_new/UTILS/arepdaem.c
*** elm/UTILS/arepdaem.c Thu Jan 10 19:26:00 1991
--- elm_new/UTILS/arepdaem.c Thu Mar 11 20:04:00 1993
***************
*** 70,76 ****
--- 70,78 ----
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
+ /*
#include <fcntl.h>
+ */
#include <errno.h>
static char ident[] = { WHAT_STRING };
***************
*** 632,638 ****
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 */
--- 634,640 ----
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 */
diff -crw elm/UTILS/fastmail.c elm_new/UTILS/fastmail.c
*** elm/UTILS/fastmail.c Fri Aug 3 22:38:00 1990
--- elm_new/UTILS/fastmail.c Thu Mar 11 20:04:00 1993
***************
*** 62,68 ****
--- 62,70 ----
#endif
#ifdef BSD
# include <sys/types.h>
+ /*
# include <sys/timeb.h>
+ */
#endif
static char ident[] = { WHAT_STRING };
diff -crw elm/UTILS/from.c elm_new/UTILS/from.c
*** elm/UTILS/from.c Fri Aug 3 22:47:00 1990
--- elm_new/UTILS/from.c Thu Mar 11 20:04:00 1993
***************
*** 35,41 ****
char username[SLEN] = {0};
#endif /* MMDF */
! #define LINEFEED (char) 10
#define metachar(c) (c == '=' || c == '+' || c == '%')
--- 35,41 ----
char username[SLEN] = {0};
#endif /* MMDF */
! #define LINEFEED (char) 13
#define metachar(c) (c == '=' || c == '+' || c == '%')
***************
*** 69,85 ****
if (optind == argc) {
/*
* determine mail file from environment variable if found,
! * else use password entry
*/
if ((cp = getenv("MAIL")) == NULL) {
! if((pass = getpwuid(getuid())) == NULL) {
! printf("You have no password entry!");
! exit(1);
! }
! sprintf(infile,"%s%s",mailhome, pass->pw_name);
}
else
strcpy(infile, cp);
optind -= 1; /* ensure one pass through loop */
}
--- 69,85 ----
if (optind == argc) {
/*
* determine mail file from environment variable if found,
! * else use login name
*/
if ((cp = getenv("MAIL")) == NULL) {
! if ((cp = getenv("LOGNAME")) == NULL)
! sprintf(infile, "%s%s", mailhome, getenv("USER"));
! else
! sprintf(infile, "%s%s", mailhome, cp);
}
else
strcpy(infile, cp);
+
optind -= 1; /* ensure one pass through loop */
}
diff -crw elm/UTILS/listalias.c elm_new/UTILS/listalias.c
*** elm/UTILS/listalias.c Fri Aug 3 22:24:00 1990
--- elm_new/UTILS/listalias.c Thu Mar 11 20:04:00 1993
***************
*** 26,32 ****
--- 26,34 ----
**/
#include <stdio.h>
+ /*
#include <fcntl.h>
+ */
#include "defs.h"
#include "sysdefs.h"
diff -crw elm/UTILS/makefile elm_new/UTILS/makefile
*** elm/UTILS/makefile Thu Jan 10 19:26:00 1991
--- elm_new/UTILS/makefile Thu Mar 11 20:04:00 1993
***************
*** 8,15 ****
#
#---------------------------------------------------------------------------
! CCFLAGS = -k0l -ixt=/dd/tmp -v=/dd/DEFS -v=/h0/DEFS/UNIX -v=/h0/DEFS_C
! LFLAGS = -m=5 -k0l -ixt=/dd/tmp
LIB = -l=/h0/lib/os9lib.l -l=/h0/lib/termlib.l
RDIR = RELS
DEBUG = -DDEBUG
--- 8,16 ----
#
#---------------------------------------------------------------------------
! G = -g
! CCFLAGS = -k0l -ixt=/dd/tmp -v=/dd/DEFS -v=/h0/DEFS/UNIX -v=/h0/DEFS_C $G
! LFLAGS = -m=5 -k0l -ixt=/dd/tmp $G
LIB = -l=/h0/lib/os9lib.l -l=/h0/lib/termlib.l
RDIR = RELS
DEBUG = -DDEBUG
***************
*** 43,48 ****
--- 44,71 ----
READMSG_OBJ = readmsg.r expand.r ../../src/rels/opt_utils.r ../../src/rels/string2.r
+ make.date: answer arepdaem autoreply fastmail frm listalias newalias newmail readmsg
+ attr -xpe $?
+ touch make.date
+
+ answer: answer.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=answer $(ANSWER_OBJ) $(LIB)
+
+ arepdaem: arepdaem.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=arepdaem $(AREPDAEMON_OBJ) $(LIB)
+
+ autoreply: autoreply.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=autoreply $(AUTOREPLY_OBJ) $(LIB)
+
+ fastmail: fastmail.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=fastmail $(FASTMAIL_OBJ) $(LIB)
+
+ frm: from.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=frm $(FRM_OBJ) $(LIB)
+
+ listalias: listalias.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=listalias $(LISTALIAS_OBJ) $(LIB)
+
newalias: newalias.r
chd $(RDIR); $(CC) $(LFLAGS) -f=newalias $(NEWALIAS_OBJ) $(LIB)
***************
*** 49,54 ****
--- 72,80 ----
readmsg: readmsg.r expand.r
chd $(RDIR); $(CC) $(LFLAGS) -f=readmsg $(READMSG_OBJ) $(LIB)
+ newmail: newmail.r
+ chd $(RDIR); $(CC) $(LFLAGS) -f=newmail $(NEWMAIL_OBJ) $(LIB)
+
# Dependencies of header files upon other header files they include
$(INCLDIR)/defs.h: $(INCLDIR)/../config.h $(INCLDIR)/sysdefs.h
attr -w $@
diff -crw elm/UTILS/newmail.c elm_new/UTILS/newmail.c
*** elm/UTILS/newmail.c Fri Aug 3 22:59:00 1990
--- elm_new/UTILS/newmail.c Thu Mar 11 20:04:00 1993
***************
*** 76,82 ****
--- 76,86 ----
static char ident[] = { WHAT_STRING };
+ #ifndef OSK
#define LINEFEED (char) 10
+ #else
+ #define LINEFEED (char) 13
+ #endif
#define BEGINNING 0 /* seek fseek(3S) */
#define DEFAULT_INTERVAL 60
***************
*** 198,205 ****
exit(0);
#else
#ifndef AUTO_BACKGROUND /* won't work if we're nested this deep! */
! if (getppid() == 1) /* we've lost our shell! */
! exit();
#endif /* AUTO_BACKGROUND */
#endif /* PIDCHECK */
--- 202,209 ----
exit(0);
#else
#ifndef AUTO_BACKGROUND /* won't work if we're nested this deep! */
! /*if (getppid() == 1) /* we've lost our shell! */ /* Comment by {mst} */
! /* exit(); /**/ /* COmment by {mst} */
#endif /* AUTO_BACKGROUND */
#endif /* PIDCHECK */
***************
*** 216,222 ****
if (folders[i].fd == (FILE *) NULL) {
if ((folders[i].fd = fopen(folders[i].foldername,"r")) == NULL)
! if (errno == EACCES) {
fprintf(stderr, "\nPermission to monitor %s denied!\n\n",
folders[i].foldername);
sleep(5);
--- 220,226 ----
if (folders[i].fd == (FILE *) NULL) {
if ((folders[i].fd = fopen(folders[i].foldername,"r")) == NULL)
! if (errno == E_FNA) {
fprintf(stderr, "\nPermission to monitor %s denied!\n\n",
folders[i].foldername);
sleep(5);
***************
*** 405,411 ****
if ((folders[current_folder].fd =
fopen(folders[current_folder].foldername, "r")) == NULL)
! if (errno == EACCES) {
fprintf(stderr, "\nPermission to monitor \"%s\" denied!\n\n",
folders[current_folder].foldername);
exit(1);
--- 409,415 ----
if ((folders[current_folder].fd =
fopen(folders[current_folder].foldername, "r")) == NULL)
! if (errno == E_FNA) {
fprintf(stderr, "\nPermission to monitor \"%s\" denied!\n\n",
folders[current_folder].foldername);
exit(1);
diff -crw elm/UTILS/readmsg.c elm_new/UTILS/readmsg.c
*** elm/UTILS/readmsg.c Fri Aug 3 22:51:00 1990
--- elm_new/UTILS/readmsg.c Thu Mar 11 20:04:00 1993
***************
*** 194,202 ****
if (strlen(infile) == 0) {
if ((cp = getenv("MAIL")) == NULL) {
if ((cp = getenv("LOGNAME")) == NULL)
! sprintf(infile, "%s/%s", mailhome, getenv("USER"));
else
! sprintf(infile, "%s/%s", mailhome, cp);
}
else
strcpy(infile, cp);
--- 194,202 ----
if (strlen(infile) == 0) {
if ((cp = getenv("MAIL")) == NULL) {
if ((cp = getenv("LOGNAME")) == NULL)
! sprintf(infile, "%s%s", mailhome, getenv("USER"));
else
! sprintf(infile, "%s%s", mailhome, cp);
}
else
strcpy(infile, cp);