*** /p/kd/fdc/mm/work/mm/cmds.c 2006-01-09 12:58:51.731051000 -0500 --- ./cmds.c 2005-12-07 17:06:51.000000000 -0500 *************** *** 1,7 **** #include "args.h" #include "config.h" /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,7 ---- #include "args.h" #include "config.h" /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 12,18 **** * * THIS FILE IS EDITED BY HAND - NOT GENERATED BY MACHINE. * Every time a new command is added, this file needs to be resync'd ! * with with values in cmds.h which is generated from cmds.hh. * * All of the top-level command tables for mm are declared here. */ --- 12,18 ---- * * THIS FILE IS EDITED BY HAND - NOT GENERATED BY MACHINE. * Every time a new command is added, this file needs to be resync'd ! * with with values in cmds.h which is generated from cmds.H. * * All of the top-level command tables for mm are declared here. */ *************** *** 55,61 **** { "download", 0, (keyval) CMD_DOWNLOAD }, { "forward", 0, (keyval) CMD_FORWARD }, { "print", 0, (keyval) CMD_PRINT }, - { "qd", KEY_INV, (keyval) CMD_DELETE }, { "remail", 0, (keyval) CMD_REMAIL }, { "reply", 0, (keyval) CMD_REPLY }, { "type", 0, (keyval) CMD_TYPE }, --- 55,60 ---- *************** *** 347,353 **** { "forward", 0, (keyval) CMD_FORWARD }, { "kill", 0, (keyval) CMD_KILL }, { "print", 0, (keyval) CMD_PRINT }, - { "qd", KEY_INV, (keyval) CMD_DELETE }, { "remail", 0, (keyval) CMD_REMAIL }, { "reply", 0, (keyval) CMD_REPLY }, { "undelete", 0, (keyval) CMD_UNDELETE }, --- 346,351 ---- *************** *** 645,656 **** cmd_mark, /* 19 CMD_DELETE */ cmd_display, /* 20 CMD_DISPLAY */ cmd_download, /* 21 CMD_DOWNOAD */ ! (T)cmd_echo, /* 22 CMD_ECHO */ ! (T)cmd_edit, /* 23 CMD_EDIT */ ! (T)cmd_erase, /* 24 CMD_ERASE */ (T)cmd_get, /* 25 CMD_EXAMINE */ (T)cmd_exit, /* 26 CMD_EXIT */ ! (T)cmd_expunge, /* 27 CMD_EXPUNGE */ cmd_fcc, /* 28 CMD_FCC */ cmd_finger, /* 29 CMD_FINGER */ cmd_mark, /* 30 CMD_FLAG */ --- 643,654 ---- cmd_mark, /* 19 CMD_DELETE */ cmd_display, /* 20 CMD_DISPLAY */ cmd_download, /* 21 CMD_DOWNOAD */ ! cmd_echo, /* 22 CMD_ECHO */ ! cmd_edit, /* 23 CMD_EDIT */ ! cmd_erase, /* 24 CMD_ERASE */ (T)cmd_get, /* 25 CMD_EXAMINE */ (T)cmd_exit, /* 26 CMD_EXIT */ ! cmd_expunge, /* 27 CMD_EXPUNGE */ cmd_fcc, /* 28 CMD_FCC */ cmd_finger, /* 29 CMD_FINGER */ cmd_mark, /* 30 CMD_FLAG */ *************** *** 676,716 **** cmd_profile, /* 50 CMD_PROFILE */ (T)cmd_push, /* 51 CMD_PUSH */ cmd_pwd, /* 52 CMD_PWD */ ! cmd_mark, /* 53 CMD_DELETE (QD) */ ! (T)cmd_quit, /* 54 CMD_QUIT */ ! (T)cmd_quit, /* 55 CMD_QQUIT */ ! (T)cmd_read, /* 56 CMD_READ */ ! cmd_remail, /* 57 CMD_REMAIL */ ! cmd_remove, /* 58 CMD_REMOVE */ ! cmd_reply, /* 59 CMD_REPLY */ ! cmd_reply_to, /* 60 CMD_REPLY_TO */ ! cmd_restore_draft, /* 61 CMD_RESTORE_DRAFT */ ! (T)cmd_read, /* 62 CMD_REVIEW */ ! cmd_route, /* 63 CMD_ROUTE */ ! cmd_save_draft, /* 64 CMD_SAVE_DRAFT */ ! cmd_send, /* 65 CMD_SEND */ ! (T)cmd_set, /* 66 CMD_SET */ ! (T)cmd_show, /* 67 CMD_SHOW */ ! cmd_smail, /* 68 CMD_SMAIL */ ! cmd_sort, /* 69 CMD_SORT */ ! cmd_spell, /* 70 CMD_SPELL */ ! cmd_status, /* 71 CMD_STATUS */ ! cmd_subject, /* 72 CMD_SUBJECT */ ! cmd_suspend, /* 73 CMD_SUSPEND */ ! cmd_take, /* 74 CMD_TAKE */ ! cmd_text, /* 75 CMD_TEXT */ ! cmd_to, /* 76 CMD_TO */ ! cmd_transfer_encoding, /* 77 CMD_TRANSFER_ENCODING */ ! cmd_type, /* 78 CMD_TYPE */ ! cmd_mark, /* 79 CMD_UNANSWER */ ! cmd_mark, /* 80 CMD_UNDELETE */ ! cmd_mark, /* 81 CMD_UNFLAG */ ! cmd_unkeyword, /* 82 CMD_UNKEYWORD */ ! cmd_mark, /* 83 CMD_UNMARK */ ! cmd_user_header, /* 84 CMD_USER_HEADER */ ! cmd_version, /* 85 CMD_VERSION */ ! (T)cmd_who, /* 86 CMD_WHO */ ! cmd_write, /* 87 CMD_WRITE */ ! cmd_suspend, /* 88 CMD_Z */ }; #undef T --- 674,713 ---- cmd_profile, /* 50 CMD_PROFILE */ (T)cmd_push, /* 51 CMD_PUSH */ cmd_pwd, /* 52 CMD_PWD */ ! (T)cmd_quit, /* 53 CMD_QUIT */ ! (T)cmd_quit, /* 54 CMD_QQUIT */ ! (T)cmd_read, /* 55 CMD_READ */ ! cmd_remail, /* 56 CMD_REMAIL */ ! cmd_remove, /* 57 CMD_REMOVE */ ! cmd_reply, /* 58 CMD_REPLY */ ! cmd_reply_to, /* 59 CMD_REPLY_TO */ ! cmd_restore_draft, /* 60 CMD_RESTORE_DRAFT */ ! (T)cmd_read, /* 61 CMD_REVIEW */ ! cmd_route, /* 62 CMD_ROUTE */ ! cmd_save_draft, /* 63 CMD_SAVE_DRAFT */ ! cmd_send, /* 64 CMD_SEND */ ! (T)cmd_set, /* 65 CMD_SET */ ! (T)cmd_show, /* 66 CMD_SHOW */ ! cmd_smail, /* 67 CMD_SMAIL */ ! cmd_sort, /* 68 CMD_SORT */ ! cmd_spell, /* 69 CMD_SPELL */ ! cmd_status, /* 70 CMD_STATUS */ ! cmd_subject, /* 71 CMD_SUBJECT */ ! cmd_suspend, /* 72 CMD_SUSPEND */ ! cmd_take, /* 73 CMD_TAKE */ ! cmd_text, /* 74 CMD_TEXT */ ! cmd_to, /* 75 CMD_TO */ ! cmd_transfer_encoding, /* 76 CMD_TRANSFER_ENCODING */ ! cmd_type, /* 77 CMD_TYPE */ ! cmd_mark, /* 78 CMD_UNANSWER */ ! cmd_mark, /* 79 CMD_UNDELETE */ ! cmd_mark, /* 80 CMD_UNFLAG */ ! cmd_unkeyword, /* 81 CMD_UNKEYWORD */ ! cmd_mark, /* 82 CMD_UNMARK */ ! cmd_user_header, /* 83 CMD_USER_HEADER */ ! cmd_version, /* 84 CMD_VERSION */ ! (T)cmd_who, /* 85 CMD_WHO */ ! cmd_write, /* 86CMD_WRITE */ ! cmd_suspend, /* 87 CMD_Z */ }; #undef T *** /p/kd/fdc/mm/work/mm/cmds.h 2006-01-09 13:00:34.511272000 -0500 --- ./cmds.h 2005-12-07 15:20:28.000000000 -0500 *************** *** 1,7 **** /* ! * DON'T EDIT cmds.h - Make changes in cmds.hh. * ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,7 ---- /* ! * DON'T EDIT cmds.h - Make changes in cmds.H. * ! * Copyright (c) 1986, 2005 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 72,135 **** #define CMD_PROFILE 50 /* */ #define CMD_PUSH 51 /* */ #define CMD_PWD 52 /* */ ! #define CMD_QD 53 /* */ ! #define CMD_QUIT 54 /* */ ! #define CMD_QQUIT 55 /* */ ! #define CMD_READ 56 /* */ ! #define CMD_REMAIL 57 /* */ ! #define CMD_REMOVE 58 /* */ ! #define CMD_REPLY 59 /* */ ! #define CMD_REPLY_TO 60 /* */ ! #define CMD_RESTORE_DRAFT 61 /* */ ! #define CMD_REVIEW 62 /* */ ! #define CMD_ROUTE 63 /* */ ! #define CMD_SAVE_DRAFT 64 /* */ ! #define CMD_SEND 65 /* */ ! #define CMD_SET 66 /* */ ! #define CMD_SHOW 67 /* */ ! #define CMD_SMAIL 68 /* */ ! #define CMD_SORT 69 /* */ ! #define CMD_SPELL 70 /* */ ! #define CMD_STATUS 71 /* */ ! #define CMD_SUBJECT 72 /* */ ! #define CMD_SUSPEND 73 /* */ ! #define CMD_TAKE 74 /* */ ! #define CMD_TEXT 75 /* */ ! #define CMD_TO 76 /* */ ! #define CMD_TRANSFER_ENCODING 77 /* */ ! #define CMD_TYPE 78 /* */ ! #define CMD_UNANSWER 79 /* */ ! #define CMD_UNDELETE 80 /* */ ! #define CMD_UNFLAG 81 /* */ ! #define CMD_UNKEYWORD 82 /* */ ! #define CMD_UNMARK 83 /* */ ! #define CMD_USER_HEADER 84 /* */ ! #define CMD_VERSION 85 /* */ ! #define CMD_WHO 86 /* */ ! #define CMD_WRITE 87 /* */ ! #define CMD_Z 88 /* */ ! ! #define CMD_HEADER 89 /* */ ! #define CMD_EXPAND 90 /* */ ! ! #define CMD_SENDER 91 /* */ ! #define CMD_ALL 92 /* */ ! ! #define CMD_INCLUDE 93 /* */ ! #define CMD_NOINCLUDE 94 /* */ ! ! #define HLP_CCMD 95 /* */ ! #define HLP_MESSAGE_SEQUENCE 96 /* */ ! #define HLP_MMINIT 97 /* */ ! #define HLP_MM 98 /* */ ! #define HLP_SHELL 99 /* */ ! #define HLP_TYPE_BABYL 100 /* */ #define HLP_TYPE_START HLP_TYPE_BABYL ! #define HLP_TYPE_MBOX 101 /* */ ! #define HLP_TYPE_MH 102 /* */ ! #define HLP_TYPE_MTXT 103 /* */ ! #define HLP_TYPE_POP2 104 /* */ ! #define HLP_TYPE_POP3 105 /* */ ! #define NUMTOPICS 106 /* */ --- 72,134 ---- #define CMD_PROFILE 50 /* */ #define CMD_PUSH 51 /* */ #define CMD_PWD 52 /* */ ! #define CMD_QUIT 53 /* */ ! #define CMD_QQUIT 54 /* */ ! #define CMD_READ 55 /* */ ! #define CMD_REMAIL 56 /* */ ! #define CMD_REMOVE 57 /* */ ! #define CMD_REPLY 58 /* */ ! #define CMD_REPLY_TO 59 /* */ ! #define CMD_RESTORE_DRAFT 60 /* */ ! #define CMD_REVIEW 61 /* */ ! #define CMD_ROUTE 62 /* */ ! #define CMD_SAVE_DRAFT 63 /* */ ! #define CMD_SEND 64 /* */ ! #define CMD_SET 65 /* */ ! #define CMD_SHOW 66 /* */ ! #define CMD_SMAIL 67 /* */ ! #define CMD_SORT 68 /* */ ! #define CMD_SPELL 69 /* */ ! #define CMD_STATUS 70 /* */ ! #define CMD_SUBJECT 71 /* */ ! #define CMD_SUSPEND 72 /* */ ! #define CMD_TAKE 73 /* */ ! #define CMD_TEXT 74 /* */ ! #define CMD_TO 75 /* */ ! #define CMD_TRANSFER_ENCODING 76 /* */ ! #define CMD_TYPE 77 /* */ ! #define CMD_UNANSWER 78 /* */ ! #define CMD_UNDELETE 79 /* */ ! #define CMD_UNFLAG 80 /* */ ! #define CMD_UNKEYWORD 81 /* */ ! #define CMD_UNMARK 82 /* */ ! #define CMD_USER_HEADER 83 /* */ ! #define CMD_VERSION 84 /* */ ! #define CMD_WHO 85 /* */ ! #define CMD_WRITE 86 /* */ ! #define CMD_Z 87 /* */ ! ! #define CMD_HEADER 88 /* */ ! #define CMD_EXPAND 89 /* */ ! ! #define CMD_SENDER 90 /* */ ! #define CMD_ALL 91 /* */ ! ! #define CMD_INCLUDE 92 /* */ ! #define CMD_NOINCLUDE 93 /* */ ! ! #define HLP_CCMD 94 /* */ ! #define HLP_MESSAGE_SEQUENCE 95 /* */ ! #define HLP_MMINIT 96 /* */ ! #define HLP_MM 97 /* */ ! #define HLP_SHELL 98 /* */ ! #define HLP_TYPE_BABYL 99 /* */ #define HLP_TYPE_START HLP_TYPE_BABYL ! #define HLP_TYPE_MBOX 100 /* */ ! #define HLP_TYPE_MH 101 /* */ ! #define HLP_TYPE_MTXT 102 /* */ ! #define HLP_TYPE_POP2 103 /* */ ! #define HLP_TYPE_POP3 104 /* */ ! #define NUMTOPICS 105 /* */ *** /p/kd/fdc/mm/work/mm/compat.c 2006-01-08 17:57:11.759051000 -0500 --- ./compat.c 2005-12-07 11:57:07.000000000 -0500 *************** *** 140,157 **** flk.l_start = 0; flk.l_len = 0; status = fcntl (fd, F_SETLK, &flk); - /* printf(">>> LOCK_FILE HAVE_F_SETLK[%s]=%d\n",name,status); */ #else #ifdef HAVE_FLOCK status = flock (fd, LOCK_NB|LOCK_EX); - /* printf(">>> LOCK_FILE HAVE_FLOCK[%s]=%d\n",name,status); */ #else #ifdef HAVE_LOCKF status = lockf (fd, F_TLOCK, 0); - /* printf(">>> LOCK_FILE HAVE_LOCKF[%s]=%d\n",name,status); */ #else status = 0; /* pretend we locked it */ - /* printf(">>> LOCK_FILE nothing[%s]=%d\n",name,status); */ #ifdef undef int lockfd; char lockfname[MAXPATHLEN]; --- 140,153 ---- *** /p/kd/fdc/mm/work/mm/config.h 2006-01-10 12:48:29.000000000 -0500 --- ./config.h 2005-12-07 16:10:13.000000000 -0500 *************** *** 1,7 **** #ifndef CONFIG_H_ #define CONFIG_H_ /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,7 ---- #ifndef CONFIG_H_ #define CONFIG_H_ /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 25,52 **** #define DONT_EMIT_FROM_HEADERS - /* Site-specific configurations start here */ - - #ifdef COLUMBIA - - /* If DONT_EMIT_FROM_HEADERS is defined REMAIL doesn't work right */ - /* See display.c */ - #ifdef DONT_EMIT_FROM_HEADERS - #undef DONT_EMIT_FROM_HEADERS - #endif /* DONT_EMIT_FROM_HEADERS */ - #define FORWARD_FILE ".forward" /* .forward file name if used */ #define GNUEMACS "emacs" /* name of GNU Emacs if present */ #undef HAVE_YP /* use yp? */ #define HAVE_NFS /* NFS used for some mail files? */ #undef HAVE_QUOTAS /* have and use quota support? */ ! #ifndef HAVE_F_SETLK /* We need file locking via fcntl() */ ! #define HAVE_F_SETLK ! #endif /* HAVE_F_SETLK */ ! #undef HAVE_LOCKF ! #undef HAVE_FLOCK ! #ifndef LIBDIR #define LIBDIR "/opt/ACISmm/lib/" #endif --- 25,37 ---- #define DONT_EMIT_FROM_HEADERS #define FORWARD_FILE ".forward" /* .forward file name if used */ #define GNUEMACS "emacs" /* name of GNU Emacs if present */ #undef HAVE_YP /* use yp? */ #define HAVE_NFS /* NFS used for some mail files? */ #undef HAVE_QUOTAS /* have and use quota support? */ ! #ifdef COLUMBIA #ifndef LIBDIR #define LIBDIR "/opt/ACISmm/lib/" #endif *************** *** 65,112 **** #ifndef MOVEMAIL #define MOVEMAIL "/opt/ACISmm/lib/movemail" #endif - - #else /* !COLUMBIA */ - - #ifdef MM_PANIX - #undef DONT_EMIT_FROM_HEADERS - - #define GNUEMACS "emacs" /* name of GNU Emacs if present */ - #undef HAVE_YP /* use yp? */ - #define HAVE_NFS /* NFS used for some mail files? */ - #undef HAVE_QUOTAS /* have and use quota support? */ - - #ifndef HAVE_F_SETLK /* We need file locking via fcntl() */ - #define HAVE_F_SETLK - #endif /* HAVE_F_SETLK */ - #undef HAVE_LOCKF - #undef HAVE_FLOCK - - #ifndef LIBDIR - #define LIBDIR "/usr/local/bin" - #endif - - #ifndef SYSINIT - #define SYSINIT "/usr/local/libdata/mm-0.91/mm.conf" - #endif - - #ifndef HELPFILE - #define HELPFILE "/pkg/mm-0.91p1/libdata/mm-0.91/mm.help" - #endif - - #ifndef HELPDIR - #define HELPDIR "/pkg/mm-0.91p1/libdata/mm-0.91/help" - #endif - - #ifndef MMAIL_PATH - #define MMAIL_PATH "/pkg/mm-0.91p1/libdata/mm-0.91/mmail.el" - #endif - - #ifndef MOVEMAIL - #define MOVEMAIL "/usr/local/bin/mdmovemail" - #endif - - #endif /* MM_PANIX */ #endif /* COLUMBIA */ #endif /* CONFIG_H_ */ --- 50,55 ---- *** /p/kd/fdc/mm/work/mm/dates.c 2006-01-08 15:20:38.264270000 -0500 --- ./dates.c 2005-05-31 14:35:34.000000000 -0400 *************** *** 229,237 **** /* * rfc822-acceptable date, like: * Thu, 1 Jan 70 00:00:00 GMT - * Apparently this routine is used only to construct the Resent-Date:. - * New messages arrive with their dates already filled in (correctly). - * Fixed 8 Jan 2006 to write the full year. */ char * #if HAVE_STDC --- 229,234 ---- *************** *** 259,269 **** #endif sprintf(str,"%3.3s, %d %3.3s %d %d:%02d:%02d %s", day_names[t->tm_wday], - #ifdef COMMENT t->tm_mday, month_names[t->tm_mon], t->tm_year /*+ 1900*/, - #else /* fdc 8 Jan 2006 */ - t->tm_mday, month_names[t->tm_mon], t->tm_year + 1900, - #endif /* COMMENT */ t->tm_hour, t->tm_min, t->tm_sec, #if BSD && !defined(__solaris) && !defined(_IBMR2) && !defined(__osf__) && !defined(HAVE_NEW_BSD) && !defined(HAVE_GNU_LINUX) timezone(tb.timezone, t->tm_isdst) --- 256,262 ---- *** /p/kd/fdc/mm/work/mm/display.c 2006-01-09 11:53:06.428949000 -0500 --- ./display.c 2005-05-28 18:39:42.000000000 -0400 *************** *** 2,13 **** #include "config.h" /* ! * Copyright (C) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. */ /* * display.c - support for the mm display command */ --- 2,17 ---- #include "config.h" /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. */ + #ifndef lint + static const char *rcsid = "$Header: /usr/local/src/mm/mm-0.94/mm/RCS/display.c,v 1.2 2005/05/28 22:39:23 beebe Exp $"; + #endif + /* * display.c - support for the mm display command */ *************** *** 181,188 **** * if expand is true, expand groups */ #ifdef DONT_EMIT_FROM_HEADERS - /* If this is defined REMAIL doesn't work right */ static int suppress_from_headers = 1; #else static int suppress_from_headers = 0; --- 185,192 ---- * if expand is true, expand groups */ + #ifdef DONT_EMIT_FROM_HEADERS static int suppress_from_headers = 1; #else static int suppress_from_headers = 0; *************** *** 200,212 **** { headers *h = msg->hdrs; - #ifdef COMMENT - extern void xxmsg(mail_msg *, char *, char); - xxmsg(msg,"DISPLAY_HEADER",'A'); - printf(">>> DISPLAY_HEADER smail=%d\n",smail); - printf(">>> DISPLAY_HEADER =%d\n",suppress_from_headers); - #endif /* COMMENT */ - if (smail && !suppress_from_headers && (msg->resent_to == NULL) && (msg->from == NULL || !valid_from_field(msg->from->string))) write_sender(pipe); --- 204,209 ---- *** /p/kd/fdc/mm/work/mm/mbox.c 2005-12-24 10:09:45.348048000 -0500 --- ./mbox.c 2005-12-07 13:23:04.000000000 -0500 *************** *** 56,64 **** * Each mbox format message starts with a line of the form "From sender date" * which may be followed by a flags line. */ - #define FROMLINELEN 256 - static char fromline[FROMLINELEN] = { 0, 0 }; - int #if HAVE_STDC mbox_rdmsg(msgvec *mail, int num) --- 56,61 ---- *************** *** 121,128 **** } /* do next message */ /* now we have the header for the message we want */ - strncpy(fromline,header,FROMLINELEN-1); /* (for error message) */ - cp = &header[keysize]; /* skip "From " (key) */ while (isspace (*cp) && *cp != '\0') /* get to actual name */ cp++; --- 118,123 ---- *************** *** 148,162 **** /* date = stringtotime (cp); */ date = mbox_date(cp); ! if (date == 0) { ! fprintf (stderr,"%s\n",fromline); /* fdc 24 dec 2005 */ ! fprintf (stderr, ! "Message %d has bad date string [%s] (continuing):\n", ! num, ! cp ! ); ! date = time((time_t)0); /* fdc 22 dec 2005 */ ! } /* now get the rest of the message */ buflen = 0; /* get some space for body of msg */ --- 143,151 ---- /* date = stringtotime (cp); */ date = mbox_date(cp); ! if (date == 0) ! fprintf (stderr,"Message %d has bad date string (continuing)\n", num); ! /* now get the rest of the message */ buflen = 0; /* get some space for body of msg */ *** /p/kd/fdc/mm/work/mm/misc.c 2006-01-08 12:58:09.144343000 -0500 --- ./misc.c 2005-12-07 13:29:20.000000000 -0500 *************** *** 1,7 **** #include "args.h" #include "config.h" /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,7 ---- #include "args.h" #include "config.h" /* ! * Copyright (c) 1986, 2003 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 44,50 **** { confirm (); printf ("%s\n", mm_version); ! puts("Copyright (C) 1986, 2006\n\ \tThe Trustees of Columbia University in the City of New York"); printf ("Compiled %s\n", mm_compiled); printf ("Report bugs to %s\n", BUGSTO); --- 44,50 ---- { confirm (); printf ("%s\n", mm_version); ! puts("Copyright (c) 1986, 2005\n\ \tThe Trustees of Columbia University in the City of New York"); printf ("Compiled %s\n", mm_compiled); printf ("Report bugs to %s\n", BUGSTO); *** /p/kd/fdc/mm/work/mm/mm.c 2006-01-08 18:37:04.082862000 -0500 --- ./mm.c 2005-12-07 17:21:16.000000000 -0500 *************** *** 1,5 **** /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,5 ---- /* ! * Copyright (c) 1986, 2005 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *** /p/kd/fdc/mm/work/mm/s-sun50.h 2006-01-09 11:52:04.814628000 -0500 --- ./s-sun50.h 2005-05-31 11:48:13.000000000 -0400 *************** *** 2,13 **** #define S_SUN50_H_ /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. */ /* * s-sun50.h - configuration file for sunos 5.0 */ --- 2,19 ---- #define S_SUN50_H_ /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. */ + #ifdef RCSID + #ifndef lint + static const char *s_sun50_rcsid = "$Header: /usr/local/src/mm/mm-0.94/mm/RCS/s-sun50.h,v 1.3 2005/05/31 15:45:22 beebe Exp $"; + #endif + #endif /* RCSID */ + /* * s-sun50.h - configuration file for sunos 5.0 */ *************** *** 228,233 **** --- 234,240 ---- #undef HAVE_F_SETLK /* we have fcntl(fd, F_SETLK, ...) */ #undef HAVE_LOCKF /* lockf works too */ #undef HAVE_FLOCK /* flock locks whole files */ + /* * If your /bin/mail program uses the flock(2) system call to prevent * simultaneous access to files in /usr/mail or /usr/spool/mail, define *** /p/kd/fdc/mm/work/mm/sendcmds.c 2006-01-08 17:00:43.453748000 -0500 --- ./sendcmds.c 2005-12-07 15:20:25.000000000 -0500 *************** *** 2,8 **** #include "config.h" /* ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 2,8 ---- #include "config.h" /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 757,769 **** addresslist *to; #endif /* HAVE_STDC */ { - /* extern void xxmsg(mail_msg *, char *, char); */ - /* not a memory leak unless parse_msg starts to malloc */ msg = parse_msg(&(cf->msgs[which])); - - /* (void)xxmsg(msg,"DO_REMAIL_ONE",'A'); */ - if (msg->resent_to) { free_header(msg, RESENT_TO); } --- 757,764 ---- *************** *** 774,785 **** if (msg->resent_date) free_header(msg, RESENT_DATE); new_header(RESENT_DATE, "Resent-Date", HEAD_KNOWN, msg); - #ifdef COMMENT msg->resent_date->string = safe_strcpy(rfctime(time(0))); - #else - msg->resent_date->string = safe_strcpy(rfctime((time_t)0)); - #endif /* COMMENT */ - if (msg->resent_from) free_header(msg, RESENT_FROM); new_header(RESENT_FROM, "Resent-From", HEAD_KNOWN, msg); --- 769,775 ---- *************** *** 787,795 **** msg->resent_from->string = safe_strcpy(create_sender()); if (msg->to) files_to_fcc(msg->to->address, msg); - - /* (void)xxmsg(msg,"DO_REMAIL_ONE",'B'); */ - sendmail(msg); } --- 777,782 ---- *** /p/kd/fdc/mm/work/mm/sendmail.c 2006-01-09 12:07:38.750108000 -0500 --- ./sendmail.c 2005-05-28 18:39:44.000000000 -0400 *************** *** 55,80 **** #define SIGNATURE ".signature" #define sendmail_who_cmd "/usr/lib/sendmail -bv" - /* From REMAIL debugging session 8 Jan 2006 */ - void - xxmsg(mail_msg *m, char *name, char c) { - if (m->resent_date) - printf(">>> %s[%c] m->resent_date->string=[%s]\n",name,c, - m->resent_date->string ? m->resent_date->string : ""); - else - printf(">>> %s[%c] m->resent_date=[(NULL)]\n",name,c); - if (m->resent_from) - printf(">>> %s[%c] m->resent_from->string=[%s]\n",name,c, - m->resent_from->string ? m->resent_from->string : ""); - else - printf(">>> %s[%c] m->resent_from=[(NULL)]\n",name,c); - if (m->from) - printf(">>> %s[%c] m->from->string=[%s]\n",name,c, - m->from->string ? m->from->string : ""); - else - printf(">>> %s[%c] m->from=[(NULL)]\n",name,c); - } - /* * sendmail: * accepts a mail_msg and forks up sendmail(8) and sends the message. --- 55,60 ---- *************** *** 93,104 **** int i, pid, mailit, fileit, saveit, failed = FALSE; char *signature = NULL; - /* xxmsg(m, "SENDMAIL", 'A'); */ - /* * Make sure the headers are complete. This is probably the wrong * place to do it, but... */ if (!m->date) { headers *h = m->hdrs, *t = m->last, *x; m->date = x = new_header (DATE, "Date", HEAD_KNOWN, m); --- 73,83 ---- int i, pid, mailit, fileit, saveit, failed = FALSE; char *signature = NULL; /* * Make sure the headers are complete. This is probably the wrong * place to do it, but... */ + if (!m->date) { headers *h = m->hdrs, *t = m->last, *x; m->date = x = new_header (DATE, "Date", HEAD_KNOWN, m); *************** *** 113,138 **** m->hdrs = x; } } - /* xxmsg(m, "SENDMAIL", 'B'); */ - if (!m->message_id) { char temp[256]; sprintf (temp, "", ! mm_major_version, mm_minor_version, mm_patch_level, ! (long)time(0), user_name, fullhostname); m->message_id = new_header (MESSAGE_ID, "Message-ID", HEAD_KNOWN, m); m->message_id->string = safe_strcpy (temp); } - /* xxmsg(m, "SENDMAIL", 'C'); */ - /* build recipient lists */ mailit = build_recipients (&argv, &Files, m); - - /* xxmsg(m, "SENDMAIL", 'D'); */ - - /* do we need to file this? */ saveit = *saved_messages_file && strcmp (saved_messages_file, "/dev/null") != 0; --- 92,109 ---- m->hdrs = x; } } if (!m->message_id) { char temp[256]; sprintf (temp, "", ! mm_major_version, mm_minor_version, mm_patch_level, (long)time(0), ! user_name, fullhostname); m->message_id = new_header (MESSAGE_ID, "Message-ID", HEAD_KNOWN, m); m->message_id->string = safe_strcpy (temp); } /* build recipient lists */ mailit = build_recipients (&argv, &Files, m); /* do we need to file this? */ saveit = *saved_messages_file && strcmp (saved_messages_file, "/dev/null") != 0; *************** *** 158,164 **** if (!sendmail_verbose && !send_verbose) { printf("Sending... "); fflush(stdout); } ! /* xxmsg(m, "SENDMAIL", 'E'); */ /* * Fire up sendmail for non-file recipients */ --- 129,135 ---- if (!sendmail_verbose && !send_verbose) { printf("Sending... "); fflush(stdout); } ! /* * Fire up sendmail for non-file recipients */ *************** *** 181,187 **** new_process_group (); - /* xxmsg(m, "SENDMAIL", 'F'); */ (void) execv (SENDMAIL, argv); _exit (errno); } --- 152,157 ---- *************** *** 949,956 **** char *tfile = mktempfile (PRE_SENDMAIL, TRUE); FILE *tfp; - /* xxmsg((mail_msg *)m, "MESSAGE_TMPFILE", 'A'); */ - if ((tfp = fopen (tfile, "w+")) == NULL) { fprintf (stderr, "Cannot create temp file %s: %s\n", tfile, errstr (errno)); --- 919,924 ---- *************** *** 961,968 **** tfile, errstr (errno)); display_header (tfp, (mail_msg*)m, FALSE, for_sendmail); - /* xxmsg((mail_msg *)m, "MESSAGE_TMPFILE", 'B'); */ - fputc ('\n', tfp); display_text (tfp, (mail_msg*)m); /* write out the body of the message */ if (signature) { --- 929,934 ---- *************** *** 971,980 **** } fflush (tfp); rewind (tfp); /* rewind to beginning of file */ - - /* xxmsg((mail_msg *)m, "MESSAGE_TMPFILE", 'C'); */ - /* printf(">>> SENDMAIL TEMP FILE=[%s]\n",tfile); */ - unlink (tfile); free(tfile); return tfp; --- 937,942 ---- *** /p/kd/fdc/mm/work/mm/set.h 2006-01-09 13:00:37.389391000 -0500 --- ./set.h 2005-12-07 15:39:33.000000000 -0500 *************** *** 1,7 **** /* ! * DON'T EDIT set.h - Make changes in set.hh. ! * ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,5 ---- /* ! * Copyright (c) 1986, 2002 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *** /p/kd/fdc/mm/work/mm/token.h 2006-01-09 13:00:57.403357000 -0500 --- ./token.h 2005-05-31 10:43:13.000000000 -0400 *************** *** 1,7 **** /* ! * DON'T EDIT tokens.h - Make changes in tokens.hh. ! * ! * Copyright (c) 1986, 2006 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. --- 1,8 ---- + #ifndef TOKEN_H_ + #define TOKEN_H_ + /* ! * Copyright (c) 1986, 1990 by The Trustees of Columbia University in * the City of New York. Permission is granted to any individual or * institution to use, copy, or redistribute this software so long as it * is not sold for profit, provided this copyright notice is retained. *************** *** 9,15 **** #ifdef RCSID #ifndef lint ! static char *token_rcsid = "$Header: /usr/local/src/mm/mm-0.94/mm/RCS/token.H,v 1.3 2005/05/31 14:43:11 beebe Exp beebe $"; #endif #endif /* RCSID */ --- 10,16 ---- #ifdef RCSID #ifndef lint ! static const char *token_rcsid = "$Header: /usr/local/src/mm/mm-0.94/mm/RCS/token.h,v 1.4 2005/05/31 14:43:11 beebe Exp beebe $"; #endif #endif /* RCSID */ *************** *** 48,50 **** --- 49,53 ---- #ifdef MAIL11 #define T_MAIL11 23 /* mail11 address */ #endif + + #endif /* TOKEN_H_ */ *** /p/kd/fdc/mm/work/mm/version.h 2006-01-09 13:00:59.077686000 -0500 --- ./version.h 2005-12-07 17:33:23.000000000 -0500 *************** *** 5,10 **** #include "mm-patchlevel.h" #define MM_MAJOR 0 #define MM_MINOR 95 ! #define MM_EDIT 68 ! #define MM_VERSION "Columbia MM, version 0.95.0(68)" ! #define MM_COMPILED "by fdc@sesame.cc.columbia.edu on 9 Jan 2006 1:00pm" --- 5,10 ---- #include "mm-patchlevel.h" #define MM_MAJOR 0 #define MM_MINOR 95 ! #define MM_EDIT 42 ! #define MM_VERSION "Columbia MM, version 0.95.0(42)" ! #define MM_COMPILED "by fdc@sesame.cc.columbia.edu on 7 Dec 2005 5:33pm"