Usenet 1994 October

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / misc / volume42 / remind / patch13a next >

Wrap

Internet Message Format | 1994-05-06 | 45.6 KB

From: dfs@doe.carleton.ca (David F. Skoll) Newsgroups: comp.sources.misc Subject: v42i064: remind - A replacement for calendar, Patch13a/3 Date: 6 May 1994 12:27:24 -0500 Organization: Dept. of Electronics, Carleton University Sender: kent@sparky.sterling.com Approved: kent@sparky.sterling.com Message-ID: <csm-v42i064=remind.122714@sparky.sterling.com> Reply-To: dfs@doe.carleton.ca (David F. Skoll) X-Md4-Signature: 950d902136bc3c234d9f53169f1c1c5f Submitted-by: dfs@doe.carleton.ca (David F. Skoll) Posting-number: Volume 42, Issue 64 Archive-name: remind/patch13a Environment: UNIX, MS-DOS, OS/2 Patch-To: remind: Volume 33, Issue 58-69 This is patch 13 for version 3.0 of Remind. Remind is a sophisticated calendar/alarm program, which runs under MS-DOS, UNIX and OS/2. It produces alarms, reminders and PostScript calendars. This patch adds a few minor features and corrects some annoying bugs. AVAILABILITY: Remind is available via anonymous ftp at ftp.doe.carleton.ca (134.117.9.35) in the directory /pub/remind-3.0 - see the file README.1st in that directory for a list of files. DEMO: If you have Xmosaic or some other WWW browser, connect to the URL 'http://www.doe.carleton.ca/students/skoll/' and look near the bottom of the document. There are some hypertext links which run a few small demos of Remind. -- David F. Skoll Here's what's new: * Version 3.0 Patch 13 + MINOR ENHANCEMENTS - Added extra parameters to the "psmoon" built-in function so you can annotate the PostScript moon icons. - Added a command-line "time" argument to Remind for testing Remind scripts with specific system times. Also added the realnow() function which has the same relationship to now() as realtoday() has to today(). (See the man page!) - Modified Rem2PS so it prints progress messages to stderr if '-v' command-line argument is used. - In the top of the 'finnish.h' file, added a note about Mikko Silvonen's file of Finnish holidays. + BUG FIXES - Fixed a bug in rem2ps which sometimes caused incorrect PostScript if the -e and -m options were used. Thanks to Michael Neuhauser for reporting the bug and providing a fix. - Made the '-k' option escape shell characters in the message to make it safer. - Fixed a segmentation violation which resulted if not all PUSH-OMIT-CONTEXTs were balanced by POP-OMIT-CONTEXTs. - Removed the prototype for DestroyValue, which is now a macro. I'm amazed that very few compilers complained about this one! - Updated the copyright notices everywhere. #!/bin/sh # This is Remind-3.0/Patch-13/part, a shell archive (shar 3.32) # made 04/20/1994 20:00 UTC by <dfs@doe.carleton.ca> (David F. Skoll) # Source directory /tmp_mnt/home/dfs/work/.rem/Remind-3.0/cur # # existing files WILL be overwritten # # This is part 1 of a multipart archive # do not concatenate these parts, unpack them in order with /bin/sh # # This shar contains: # length mode name # ------ ---------- ------------------------------------------ # 95144 -rw------- patch.13 # if touch 2>&1 | fgrep 'amc' > /dev/null then TOUCH=touch else TOUCH=true fi if test -r shar3_seq_.tmp; then echo "Must unpack archives in sequence!" next=`cat shar3_seq_.tmp`; echo "Please unpack part $next next" exit 1 fi # ============= patch.13 ============== echo "x - extracting patch.13 (Text)" sed 's/^X//' << 'SHAR_EOF' > patch.13 && XPrereq: "03.00.12" X*** ../prev/version.h Tue Nov 23 11:50:39 1993 X--- ./version.h Mon Jan 31 17:01:25 1994 X*************** X*** 5,12 **** X /* What version of remind do we have? */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X! #define VERSION "03.00.12" X--- 5,12 ---- X /* What version of remind do we have? */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll */ X /* */ X /***************************************************************/ X X! #define VERSION "03.00.13" X*** ../prev/COPYRIGHT Tue Oct 12 16:22:34 1993 X--- ./COPYRIGHT Mon Jan 31 16:51:20 1994 X*************** X*** 3,10 **** X 1. REMIND refers to the entire set of files and documentation in the X REMIND package. X X! 2. REMIND is Copyright 1990, 1991, 1992, 1993 by David Skoll, except where X! noted in individual files. X X 3. You may use REMIND for free, and may freely distribute it, providing X you do not charge the recipients to whom you distribute REMIND. X--- 3,10 ---- X 1. REMIND refers to the entire set of files and documentation in the X REMIND package. X X! 2. REMIND is Copyright 1990, 1991, 1992, 1993, 1994 by David Skoll, X! except where noted in individual files. X X 3. You may use REMIND for free, and may freely distribute it, providing X you do not charge the recipients to whom you distribute REMIND. X*************** X*** 24,34 **** X of the modified version that it is modified. Place that notice in the X WHATSNEW.xx file. X X! 6. You may incorporate parts of REMIND into your own programs, providing X! you do not sell these programs. You must clearly indicate that the X! parts of REMIND you have incorporated are Copyright 1990, 1991, 1992, X! 1993 by David Skoll. These programs can be distributed according to X! the terms of paragraphs 3 and 4. X X 7. I will attempt to support REMIND as much as possible. However, X REMIND is supplied on an "as-is" basis with no warranty. You use it X--- 24,34 ---- X of the modified version that it is modified. Place that notice in the X WHATSNEW.xx file. X X! 6. You may incorporate parts of REMIND into your own programs, X! providing you do not sell these programs. You must clearly indicate X! that the parts of REMIND you have incorporated are Copyright 1990, X! 1991, 1992, 1993, 1994 by David Skoll. These programs can be X! distributed according to the terms of paragraphs 3 and 4. X X 7. I will attempt to support REMIND as much as possible. However, X REMIND is supplied on an "as-is" basis with no warranty. You use it X*** ../prev/Makefile Mon Jan 31 10:41:23 1994 X--- ./Makefile Mon Jan 31 16:48:50 1994 X*************** X*** 53,59 **** X # YOU SHOULDN'T EDIT ANYTHING BELOW HERE. You may want to change some things X # in config.h; then, you should be able to type 'make'. X #----------------------------------------------------------------------------- X! VERSION= 03.00.12 X MATHLIB= -lm X X HDRS= config.h err.h expr.h globals.h protos.h types.h version.h \ X--- 53,59 ---- X # YOU SHOULDN'T EDIT ANYTHING BELOW HERE. You may want to change some things X # in config.h; then, you should be able to type 'make'. X #----------------------------------------------------------------------------- X! VERSION= 03.00.13 X MATHLIB= -lm X X HDRS= config.h err.h expr.h globals.h protos.h types.h version.h \ X*************** X*** 121,128 **** X var.o: var.c $(STDHDRS) expr.h X X tarZ: X! tar cvf remind-3.0.12.tar $(MANIFEST) X! compress -v remind-3.0.12.tar X X shar: X shar -x -n"Remind $(VERSION)" -l45 -o./Shar $(MANIFEST) X--- 121,128 ---- X var.o: var.c $(STDHDRS) expr.h X X tarZ: X! tar cvf remind-3.0.13.tar $(MANIFEST) X! compress -v remind-3.0.13.tar X X shar: X shar -x -n"Remind $(VERSION)" -l45 -o./Shar $(MANIFEST) X*************** X*** 194,202 **** X release: X -mkdir RELEASE X -rm -f RELEASE/* X! mkpatch ../prev . patch.12 Shar "Remind-3.0/Patch-12/part" X mv Shar* RELEASE X! rm -f patch.12 X for i in *.1; do nroff -man $$i | sed -e 's/_//g' > `basename $$i .1`.man; done X mv *.man RELEASE X for i in *.1; do groff -man -Tps $$i > `basename $$i .1`.ps; done X--- 194,202 ---- X release: X -mkdir RELEASE X -rm -f RELEASE/* X! mkpatch ../prev . patch.13 Shar "Remind-3.0/Patch-13/part" X mv Shar* RELEASE X! rm -f patch.13* X for i in *.1; do nroff -man $$i | sed -e 's/_//g' > `basename $$i .1`.man; done X mv *.man RELEASE X for i in *.1; do groff -man -Tps $$i > `basename $$i .1`.ps; done X*** ../prev/WHATSNEW.30 Mon Jan 31 16:25:21 1994 X--- ./WHATSNEW.30 Mon Apr 18 10:19:12 1994 X*************** X*** 1,5 **** X--- 1,40 ---- X CHANGES TO REMIND X X+ * Version 3.0 Patch 13 X+ X+ + MINOR ENHANCEMENTS X+ X+ - Added extra parameters to the "psmoon" built-in function so you X+ can annotate the PostScript moon icons. X+ X+ - Added a command-line "time" argument to Remind for testing Remind X+ scripts with specific system times. Also added the realnow() function X+ which has the same relationship to now() as realtoday() has to today(). X+ (See the man page!) X+ X+ - Modified Rem2PS so it prints progress messages to stderr if X+ '-v' command-line argument is used. X+ X+ - In the top of the 'finnish.h' file, added a note about X+ Mikko Silvonen's file of Finnish holidays. X+ X+ + BUG FIXES X+ X+ - Fixed a bug in rem2ps which sometimes caused incorrect PostScript if X+ the -e and -m options were used. Thanks to Michael Neuhauser for X+ reporting the bug and providing a fix. X+ X+ - Made the '-k' option escape shell characters in the message to make it X+ safer. X+ X+ - Fixed a segmentation violation which resulted if not all X+ PUSH-OMIT-CONTEXTs were balanced by POP-OMIT-CONTEXTs. X+ X+ - Removed the prototype for DestroyValue, which is now a macro. I'm X+ amazed that very few compilers complained about this one! X+ X+ - Updated the copyright notices everywhere. X+ X * Version 3.0 Patch 12 X X + MINOR ENHANCEMENTS X*** ../prev/calendar.c Tue Nov 16 17:41:51 1993 X--- ./calendar.c Mon Jan 31 16:56:00 1994 X*************** X*** 5,11 **** X /* The code for generating a calendar. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X--- 5,11 ---- X /* The code for generating a calendar. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X*** ../prev/config.h Mon Jan 31 10:34:11 1994 X--- ./config.h Thu Feb 10 16:59:18 1994 X*************** X*** 7,13 **** X /* care of certain system dependencies. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 7,13 ---- X /* care of certain system dependencies. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*************** X*** 87,92 **** X--- 87,100 ---- X /* work. */ X /*---------------------------------------------------------------------*/ X #define WANT_U_OPTION 1 X+ X+ /*---------------------------------------------------------------------*/ X+ /* WANT_SHELL_ESCAPING: Define this if you want special shell */ X+ /* characters to be escaped with a backslash for the -k option. */ X+ /*---------------------------------------------------------------------*/ X+ #if defined(UNIX) X+ #define WANT_SHELL_ESCAPING 1 X+ #endif X X /*---------------------------------------------------------------------*/ X /* STRSTR: If your system does not have the "strstr" function, */ X*** ../prev/danish.h Wed Dec 1 10:45:55 1993 X--- ./danish.h Mon Jan 31 16:55:44 1994 X*************** X*** 6,12 **** X /* */ X /* This file is part of REMIND. */ X /* */ X! /* REMIND is Copyright (C) 1992, 1993 by David F. Skoll. */ X /* This file is Copyright (C) 1993 by Mogens Lynnerup. */ X /* */ X /***************************************************************/ X--- 6,12 ---- X /* */ X /* This file is part of REMIND. */ X /* */ X! /* REMIND is Copyright (C) 1992, 1993, 1994 by David F. Skoll */ X /* This file is Copyright (C) 1993 by Mogens Lynnerup. */ X /* */ X /***************************************************************/ X*** ../prev/defs.rem Fri Nov 5 15:57:33 1993 X--- ./defs.rem Wed Feb 9 16:04:27 1994 X*************** X*** 17,23 **** X # "#COLORS" for examples of ANSI color escape sequences. # X # # X # This file is part of REMIND. # X! # Copyright (C) 1992, 1993 by David F. Skoll # X # # X ############################################################################# X X--- 17,23 ---- X # "#COLORS" for examples of ANSI color escape sequences. # X # # X # This file is part of REMIND. # X! # Copyright (C) 1992, 1993, 1994 by David F. Skoll # X # # X ############################################################################# X X*************** X*** 423,432 **** X # dates were obtained from "The First Jewish Catalog" by Richard Siegel # X # and Michael and Sharon Strassfeld, published by the Jewish Publication # X # Society of America. The Reform version of the calendar was guessed # X! # at by David Skoll based on experience. Additional corrections were # X! # made from the paper "Calendrical Calculations" by Nachum Dershowitz # X! # and Edward M. Reingold. Any further corrections are welcome. # X # # X ########################################################################## X X # Here are some general functions that you might find nice to use X--- 423,436 ---- X # dates were obtained from "The First Jewish Catalog" by Richard Siegel # X # and Michael and Sharon Strassfeld, published by the Jewish Publication # X # Society of America. The Reform version of the calendar was guessed # X! # at by David Skoll based on experience. There is probably no standard # X! # Reform position on many of the holidays, so you may have to adjust # X! # the file as required. # X # # X+ # Additional corrections were made from the paper "Calendrical # X+ # Calculations" by Nachum Dershowitz and Edward M. Reingold. Any # X+ # further corrections are welcome. # X+ # # X ########################################################################## X X # Here are some general functions that you might find nice to use X*************** X*** 451,459 **** X # Convenient function definition to save typing X FSET _h(x, y) TRIGGER(HEBDATE(x,y)) X FSET _h2(x, y) HEBDATE(x, y, TODAY()-7) X! FSET _PastSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, \ X! TRIGGER(_h2(x,y)), \ X! TRIGGER(_h2(x,y)+1)) X X # Default values in case InIsrael and Reform are not set X SET InIsrael VALUE("InIsrael", 0) X--- 455,461 ---- X # Convenient function definition to save typing X FSET _h(x, y) TRIGGER(HEBDATE(x,y)) X FSET _h2(x, y) HEBDATE(x, y, TODAY()-7) X! FSET _PastSat(x, y) TRIGGER(IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)+1)) X X # Default values in case InIsrael and Reform are not set X SET InIsrael VALUE("InIsrael", 0) X*************** X*** 496,503 **** X X # Not sure about Reform's position on the next one. X IF !Reform X! # The fast is moved to the 11th if the 10th is a Saturday X! REM [_PastSat(10, "Tevet")] MSG %"Tzom Tevet%" is %b. X ENDIF X X [_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b. X--- 498,506 ---- X X # Not sure about Reform's position on the next one. X IF !Reform X! # 10 Tevet will never be a Saturday, so whether or not to X! # move it is moot. (Thanks to Art Werschulz.) X! [_h(10, "Tevet")] MSG %"Tzom Tevet%" is %b. X ENDIF X X [_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b. X*** ../prev/dorem.c Mon Jan 31 16:23:42 1994 X--- ./dorem.c Wed Apr 6 16:47:57 1994 X*************** X*** 7,13 **** X /* commands. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X--- 7,13 ---- X /* commands. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X*************** X*** 553,559 **** X DestroyValue(v); X } X } X! if (!MsgCommand && (t->typ == MSG_TYPE || t->typ == MSF_TYPE)) { X *s2++ = '\n'; X } X *s2 = 0; X--- 553,559 ---- X DestroyValue(v); X } X } X! if ((!MsgCommand && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) { X *s2++ = '\n'; X } X *s2 = 0; X*************** X*** 571,578 **** X switch(t->typ) { X case MSG_TYPE: X if (MsgCommand) { X! sprintf(SubstBuffer, MsgCommand, buf); X! system(SubstBuffer); X } else { X #ifdef OS2_POPUP X if (AsPopUp) X--- 571,577 ---- X switch(t->typ) { X case MSG_TYPE: X if (MsgCommand) { X! DoMsgCommand(MsgCommand, buf); X } else { X #ifdef OS2_POPUP X if (AsPopUp) X*************** X*** 651,657 **** X /*** REMOVED... X if (jul == JulianToday && X tim->ttime != NO_TIME && X! tim->ttime < SystemTime() / 60) return 0; X *** ...UNTIL HERE */ X X /* If "infinite delta" option is chosen, always trigger future reminders */ X--- 650,656 ---- X /*** REMOVED... X if (jul == JulianToday && X tim->ttime != NO_TIME && X! tim->ttime < SystemTime(0) / 60) return 0; X *** ...UNTIL HERE */ X X /* If "infinite delta" option is chosen, always trigger future reminders */ X*************** X*** 754,756 **** X--- 753,793 ---- X t->priority = p; X return OK; X } X+ X+ /***************************************************************/ X+ /* */ X+ /* DoMsgCommand */ X+ /* */ X+ /* Execute the '-k' command, escaping shell chars in message. */ X+ /* */ X+ /***************************************************************/ X+ #ifdef HAVE_PROTOS X+ PUBLIC void DoMsgCommand(char *cmd, char *msg) X+ #else X+ void DoMsgCommand(cmd, msg) X+ char *cmd; X+ char *msg; X+ #endif X+ { X+ X+ #ifdef WANT_SHELL_ESCAPING X+ char buf[2*LINELEN+TOKSIZE]; X+ char *s, *t; X+ X+ /* Escape shell characters in msg INCLUDING WHITESPACE! */ X+ for (t=buf, s=msg; *s; s++) { X+ if (isspace(*s) || strchr("\"'!$%^&*()|<>[]{}`~;?\\", *s)) *t++ = '\\'; X+ *t++ = *s; X+ } X+ *t = 0; X+ X+ /* Use SubstBuffer -- not too safe, since no check for overflow... */ X+ sprintf(SubstBuffer, cmd, buf); X+ #else X+ sprintf(SubstBuffer, cmd, msg); X+ #endif /* WANT_SHELL_ESCAPING */ X+ system(SubstBuffer); X+ } X+ X+ X+ X*** ../prev/dosubst.c Tue Nov 2 14:50:16 1993 X--- ./dosubst.c Wed Apr 6 16:47:51 1994 X*************** X*** 6,12 **** X /* reminders are triggered. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X #define L_IN_DOSUBST X--- 6,12 ---- X /* reminders are triggered. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X #define L_IN_DOSUBST X*************** X*** 55,61 **** X #endif X { X int diff = jul - JulianToday; X! int curtime = SystemTime() / 60; X int err, done; X int c; X int d, m, y; X--- 55,61 ---- X #endif X { X int diff = jul - JulianToday; X! int curtime = SystemTime(0) / 60; X int err, done; X int c; X int d, m, y; X*************** X*** 646,652 **** X int r; X X if (jul == NO_DATE) jul=JulianToday; X! if (tim == NO_TIME) tim=SystemTime()/60; X CreateParser(source, &tempP); X tempP.allownested = 0; X tempTrig.typ = MSG_TYPE; X--- 646,652 ---- X int r; X X if (jul == NO_DATE) jul=JulianToday; X! if (tim == NO_TIME) tim=SystemTime(0)/60; X CreateParser(source, &tempP); X tempP.allownested = 0; X tempTrig.typ = MSG_TYPE; X*** ../prev/dutch.h Tue Oct 12 16:22:38 1993 X--- ./dutch.h Mon Jan 31 16:55:06 1994 X*************** X*** 11,17 **** X /* Further corrections by Erik-Jan Vens */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 11,17 ---- X /* Further corrections by Erik-Jan Vens */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/english.h Tue Oct 12 16:22:38 1993 X--- ./english.h Mon Jan 31 16:54:58 1994 X*************** X*** 5,11 **** X /* Support for the English language. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 5,11 ---- X /* Support for the English language. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/err.h Tue Oct 12 16:22:38 1993 X--- ./err.h Mon Jan 31 16:54:49 1994 X*************** X*** 5,11 **** X /* Error definitions. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 5,11 ---- X /* Error definitions. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/expr.c Tue Nov 16 17:41:38 1993 X--- ./expr.c Mon Jan 31 16:54:40 1994 X*************** X*** 5,11 **** X /* This file contains routines to parse and evaluate */ X /* expressions. */ X /* */ X! /* Copyright 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 5,11 ---- X /* This file contains routines to parse and evaluate */ X /* expressions. */ X /* */ X! /* Copyright 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/expr.h Tue Nov 16 16:12:44 1993 X--- ./expr.h Mon Jan 31 16:54:32 1994 X*************** X*** 5,11 **** X /* Contains a few definitions used by expression evaluator. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 5,11 ---- X /* Contains a few definitions used by expression evaluator. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/files.c Mon Nov 15 14:25:27 1993 X--- ./files.c Mon Jan 31 16:54:25 1994 X*************** X*** 7,13 **** X /* files. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 7,13 ---- X /* files. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/finnish.h Wed Oct 13 11:03:07 1993 X--- ./finnish.h Thu Apr 7 11:00:22 1994 X*************** X*** 6,13 **** X /* */ X /* Author: Mikko Silvonen <Mikko.Silvonen@Helsinki.FI> */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 6,17 ---- X /* */ X /* Author: Mikko Silvonen <Mikko.Silvonen@Helsinki.FI> */ X /* */ X+ /* Finnish holidays and name days for Remind are available */ X+ /* at ftp.funet.fi (pub/unix/misc/remind-fin*). */ X+ /* */ X /* This file is part of REMIND. */ X! /* This file is Copyright (C) 1993, 1994 by Mikko Silvonen. */ X! /* REMIND is Copyright (C) 1992, 1993, 1994 by David F. Skoll */ X /* */ X /***************************************************************/ X X*************** X*** 515,526 **** X void Usage() X #endif /* HAVE_PROTOS */ X { X! fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992, 1993 by David F. Skoll\n", VERSION, L_LANGNAME); X #ifdef BETA X fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n"); X #endif X #if defined(ISOLATIN1) X! fprintf(ErrFp, "K\xE4ytt\xF6: remind [tarkenteet] tiedosto [p\xE4iv\xE4ys]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est\xE4 RUN-lauseiden k\xE4ytt\xF6\n"); X--- 519,530 ---- X void Usage() X #endif /* HAVE_PROTOS */ X { X! fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1994 by David F. Skoll\n", VERSION, L_LANGNAME); X #ifdef BETA X fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n"); X #endif X #if defined(ISOLATIN1) X! fprintf(ErrFp, "K\xE4ytt\xF6: remind [tarkenteet] tiedosto [p\xE4iv\xE4ys] [aika] [*toisto]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est\xE4 RUN-lauseiden k\xE4ytt\xF6\n"); X*************** X*** 549,555 **** X fprintf(ErrFp, " -m Aloita kalenteri maanantaista eik\xE4 sunnuntaista\n"); X exit(1); X #elif defined(IBMEXTENDED) X! fprintf(ErrFp, "K\x84ytt\x94: remind [tarkenteet] tiedosto [p\x84iv\x84ys]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est\x84 RUN-lauseiden k\x84ytt\x94\n"); X--- 553,559 ---- X fprintf(ErrFp, " -m Aloita kalenteri maanantaista eik\xE4 sunnuntaista\n"); X exit(1); X #elif defined(IBMEXTENDED) X! fprintf(ErrFp, "K\x84ytt\x94: remind [tarkenteet] tiedosto [p\x84iv\x84ys] [aika] [*toisto]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est\x84 RUN-lauseiden k\x84ytt\x94\n"); X*************** X*** 578,584 **** X fprintf(ErrFp, " -m Aloita kalenteri maanantaista eik\x84 sunnuntaista\n"); X exit(1); X #else X! fprintf(ErrFp, "K{ytt|: remind [tarkenteet] tiedosto [p{iv{ys]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est{ RUN-lauseiden k{ytt|\n"); X--- 582,588 ---- X fprintf(ErrFp, " -m Aloita kalenteri maanantaista eik\x84 sunnuntaista\n"); X exit(1); X #else X! fprintf(ErrFp, "K{ytt|: remind [tarkenteet] tiedosto [p{iv{ys] [aika] [*toisto]\n"); X fprintf(ErrFp, "Tarkenteet:\n"); X fprintf(ErrFp, " -n Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n"); X fprintf(ErrFp, " -r Est{ RUN-lauseiden k{ytt|\n"); X*** ../prev/french.h Tue Nov 2 14:55:03 1993 X--- ./french.h Thu Apr 7 15:36:08 1994 X*************** X*** 8,14 **** X /* */ X /* This file is part of REMIND. */ X /* */ X! /* REMIND is Copyright (C) 1992, 1993 by David F. Skoll. */ X /* This file is Copyright (C) 1993 by Laurent Duperval and */ X /* David F. Skoll. */ X /* */ X--- 8,14 ---- X /* */ X /* This file is part of REMIND. */ X /* */ X! /* REMIND is Copyright (C) 1992, 1993, 1994 by David F. Skoll */ X /* This file is Copyright (C) 1993 by Laurent Duperval and */ X /* David F. Skoll. */ X /* */ X*************** X*** 358,369 **** X void Usage() X #endif /* HAVE_PROTOS */ X { X! fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992, 1993 by David F. Skoll\n", VERSION, L_LANGNAME); X #ifdef BETA X fprintf(ErrFp, ">>>> BETA VERSION <<<<\n"); X #endif X #ifdef ISOLATIN1 X! fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [*r\351p\351tition]\n"); X fprintf(ErrFp, "Options:\n"); X fprintf(ErrFp, " -n Afficher la prochaine occurence des rappels en format simple\n"); X fprintf(ErrFp, " -r D\351sactiver les instructions RUN\n"); X--- 358,369 ---- X void Usage() X #endif /* HAVE_PROTOS */ X { X! fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1994 by David F. Skoll\n", VERSION, L_LANGNAME); X #ifdef BETA X fprintf(ErrFp, ">>>> BETA VERSION <<<<\n"); X #endif X #ifdef ISOLATIN1 X! fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [heure] [*r\351p\351tition]\n"); X fprintf(ErrFp, "Options:\n"); X fprintf(ErrFp, " -n Afficher la prochaine occurence des rappels en format simple\n"); X fprintf(ErrFp, " -r D\351sactiver les instructions RUN\n"); X*************** X*** 391,397 **** X fprintf(ErrFp, " -ivar=val Initialiser var \340 val et conserver var\n"); X fprintf(ErrFp, " -m Commencer le calendrier avec lundi plut\364t que dimanche\n"); X #else /* ISOLATIN1 */ X! fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [*repetition]\n"); X fprintf(ErrFp, "Options:\n"); X fprintf(ErrFp, " -n Afficher la prochaine occurence des rappels en format simple\n"); X fprintf(ErrFp, " -r Desactiver les instructions RUN\n"); X--- 391,397 ---- X fprintf(ErrFp, " -ivar=val Initialiser var \340 val et conserver var\n"); X fprintf(ErrFp, " -m Commencer le calendrier avec lundi plut\364t que dimanche\n"); X #else /* ISOLATIN1 */ X! fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [heure] [*repetition]\n"); X fprintf(ErrFp, "Options:\n"); X fprintf(ErrFp, " -n Afficher la prochaine occurence des rappels en format simple\n"); X fprintf(ErrFp, " -r Desactiver les instructions RUN\n"); X*** ../prev/funcs.c Mon Jan 31 10:28:55 1994 X--- ./funcs.c Thu Apr 7 12:37:13 1994 X*************** X*** 6,12 **** X /* expressions. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X--- 6,12 ---- X /* expressions. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X*************** X*** 111,116 **** X--- 111,117 ---- X PRIVATE int FIsleap ARGS ((void)); X PRIVATE int FLower ARGS ((void)); X PRIVATE int FNow ARGS ((void)); X+ PRIVATE int FRealnow ARGS ((void)); X PRIVATE int FRealtoday ARGS ((void)); X PRIVATE int FToday ARGS ((void)); X PRIVATE int FTrigger ARGS ((void)); X*************** X*** 223,230 **** X { "ord", 1, 1, FOrd }, X { "ostype", 0, 0, FOstype }, X { "plural", 1, 3, FPlural }, X! { "psmoon", 1, 2, FPsmoon}, X { "psshade", 1, 1, FPsshade}, X { "realtoday", 0, 0, FRealtoday }, X { "sgn", 1, 1, FSgn }, X { "shell", 1, 1, FShell }, X--- 224,232 ---- X { "ord", 1, 1, FOrd }, X { "ostype", 0, 0, FOstype }, X { "plural", 1, 3, FPlural }, X! { "psmoon", 1, 4, FPsmoon}, X { "psshade", 1, 1, FPsshade}, X+ { "realnow", 0, 0, FRealnow}, X { "realtoday", 0, 0, FRealtoday }, X { "sgn", 1, 1, FSgn }, X { "shell", 1, 1, FShell }, X*************** X*** 1004,1010 **** X /* */ X /* FToday - return the system's notion of "today" */ X /* Frealtoday - return today's date as read from OS. */ X! /* FNow - return the system time */ X /* */ X /***************************************************************/ X #ifdef HAVE_PROTOS X--- 1006,1013 ---- X /* */ X /* FToday - return the system's notion of "today" */ X /* Frealtoday - return today's date as read from OS. */ X! /* FNow - return the system time (or time on cmd line.) */ X! /* FRealnow - return the true system time */ X /* */ X /***************************************************************/ X #ifdef HAVE_PROTOS X*************** X*** 1036,1045 **** X #endif X { X RetVal.type = TIM_TYPE; X! RetVal.v.val = (int) ( SystemTime() / 60L ); X return OK; X } X X /***************************************************************/ X /* */ X /* FGetenv - get the value of an environment variable. */ X--- 1039,1058 ---- X #endif X { X RetVal.type = TIM_TYPE; X! RetVal.v.val = (int) ( SystemTime(0) / 60L ); X return OK; X } X X+ #ifdef HAVE_PROTOS X+ PRIVATE int FRealnow(void) X+ #else X+ static int FRealnow() X+ #endif X+ { X+ RetVal.type = TIM_TYPE; X+ RetVal.v.val = (int) ( SystemTime(1) / 60L ); X+ return OK; X+ } X /***************************************************************/ X /* */ X /* FGetenv - get the value of an environment variable. */ X*************** X*** 2155,2174 **** X static int FPsmoon() X #endif X { X! char psbuff[256]; X char sizebuf[30]; X char *s = psbuff; X if (ARG(0).type != INT_TYPE) return E_BAD_TYPE; X if (ARG(0).v.val < 0) return E_2LOW; X if (ARG(0).v.val > 3) return E_2HIGH; X if (Nargs > 1) { X if (ARG(1).type != INT_TYPE) return E_BAD_TYPE; X! if (ARG(1).v.val <= 0) return E_2LOW; X! sprintf(sizebuf, "%d", ARG(1).v.val); X } else { X strcpy(sizebuf, "DaySize 2 div"); X } X X sprintf(s, "gsave 0 setgray newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X--- 2168,2210 ---- X static int FPsmoon() X #endif X { X! char psbuff[512]; X char sizebuf[30]; X+ char fontsizebuf[30]; X char *s = psbuff; X+ char *extra = NULL; X+ int size = -1; X+ int fontsize = -1; X+ X if (ARG(0).type != INT_TYPE) return E_BAD_TYPE; X if (ARG(0).v.val < 0) return E_2LOW; X if (ARG(0).v.val > 3) return E_2HIGH; X if (Nargs > 1) { X if (ARG(1).type != INT_TYPE) return E_BAD_TYPE; X! if (ARG(1).v.val < -1) return E_2LOW; X! size = ARG(1).v.val; X! if (Nargs > 2) { X! if (ARG(2).type != STR_TYPE) return E_BAD_TYPE; X! extra = ARG(2).v.str; X! if (Nargs > 3) { X! if (ARG(3).type != INT_TYPE) return E_BAD_TYPE; X! if (ARG(3).v.val <= 0) return E_2LOW; X! fontsize = ARG(3).v.val; X! } X! } X! } X! if (size > 0) { X! sprintf(sizebuf, "%d", size); X } else { X strcpy(sizebuf, "DaySize 2 div"); X } X X+ if (fontsize > 0) { X+ sprintf(fontsizebuf, "%d", fontsize); X+ } else { X+ strcpy(fontsizebuf, "EntrySize"); X+ } X+ X sprintf(s, "gsave 0 setgray newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X*************** X*** 2176,2186 **** X s += strlen(s); X switch(ARG(0).v.val) { X case 0: X! sprintf(s, " fill grestore"); X break; X X case 2: X! sprintf(s, " stroke grestore"); X break; X X case 1: X--- 2212,2224 ---- X s += strlen(s); X switch(ARG(0).v.val) { X case 0: X! sprintf(s, " fill"); X! s += strlen(s); X break; X X case 2: X! sprintf(s, " stroke"); X! s += strlen(s); X break; X X case 1: X*************** X*** 2189,2195 **** X sprintf(s, " newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X! sprintf(s, " %s 90 270 arc closepath fill grestore", sizebuf); X break; X X default: X--- 2227,2234 ---- X sprintf(s, " newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X! sprintf(s, " %s 90 270 arc closepath fill", sizebuf); X! s += strlen(s); X break; X X default: X*************** X*** 2198,2206 **** X sprintf(s, " newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X! sprintf(s, " %s 270 90 arc closepath fill grestore", sizebuf); X break; X } X return RetStrVal(psbuff); X } X X--- 2237,2253 ---- X sprintf(s, " newpath Border %s add BoxHeight Border sub %s sub", X sizebuf, sizebuf); X s += strlen(s); X! sprintf(s, " %s 270 90 arc closepath fill", sizebuf); X! s += strlen(s); X break; X } X+ if (extra) { X+ sprintf(s, " Border %s add %s add Border add BoxHeight border sub %s sub %s sub moveto /EntryFont findfont %s scalefont setfont (%s) show", X+ sizebuf, sizebuf, sizebuf, sizebuf, fontsizebuf, extra); X+ s += strlen(s); X+ } X+ X+ sprintf(s, " grestore"); X return RetStrVal(psbuff); X } X X*** ../prev/german.h Tue Oct 12 16:22:42 1993 X--- ./german.h Mon Jan 31 16:53:47 1994 X*************** X*** 9,15 **** X /* I don't speak German. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X X--- 9,15 ---- X /* I don't speak German. */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X X*** ../prev/globals.c Tue Oct 12 16:22:42 1993 X--- ./globals.c Mon Jan 31 16:53:39 1994 X*************** X*** 8,14 **** X /* globals.h and err.h */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X--- 8,14 ---- X /* globals.h and err.h */ X /* */ X /* This file is part of REMIND. */ X! /* Copyright (C) 1992, 1993, 1994 by David F. Skoll. */ X /* */ X /***************************************************************/ X #include "config.h" X*** ../prev/globals.h Tue Nov 16 17:45:06 1993 X--- ./globals.h Wed Apr 6 16:36:23 1994 X*************** X*** 7,13 **** X /* MK_GLOBALS. Also contains useful macro definitions. */ X /* */ X /* This file is part of REMIND. */ SHAR_EOF echo "End of Remind-3.0/Patch-13/part part 1" echo "File patch.13 is continued in part 2" echo "2" > shar3_seq_.tmp exit 0 exit 0 # Just in case...