From 2bc3d991c13b5f483ee2b23e889e13cb9d774afe Mon Sep 17 00:00:00 2001 From: dfs Date: Fri, 18 Feb 2000 03:45:11 +0000 Subject: [PATCH] -- Updated contact info, copyright years, etc. --- ACKNOWLEDGEMENTS | 4 +- COPYRIGHT | 4 +- README | 5 +- build.tk | 6 +- configure | 493 ++++++++++++++++++++++++++++++------------ configure.in | 4 +- docs/README.AMIGA | 9 +- docs/README.BCC | 6 +- docs/README.DOS | 6 +- docs/README.OS2 | 11 +- docs/README.UNIX | 5 +- docs/README_QDOS | 5 +- docs/WHATSNEW.30 | 6 + examples/defs.rem | 6 +- man/remind.1 | 14 +- scripts/cm2rem.tcl | 4 +- scripts/remind-all.sh | 4 +- scripts/tkremind | 6 +- src/Makefile.in | 7 +- src/amiga.c | 4 +- src/calendar.c | 4 +- src/config.h.in | 5 +- src/custom.h.in | 9 +- src/dorem.c | 4 +- src/dosubst.c | 6 +- src/dynbuf.c | 4 +- src/dynbuf.h | 4 +- src/err.h | 4 +- src/expr.c | 4 +- src/expr.h | 4 +- src/files.c | 4 +- src/funcs.c | 46 ++-- src/globals.c | 4 +- src/globals.h | 4 +- src/hbcal.c | 4 +- src/init.c | 4 +- src/lang.h | 6 +- src/langs/danish.h | 4 +- src/langs/dutch.h | 4 +- src/langs/english.h | 4 +- src/langs/finnish.h | 4 +- src/langs/french.h | 4 +- src/langs/german.h | 4 +- src/langs/italian.h | 4 +- src/langs/norwgian.h | 4 +- src/langs/polish.h | 4 +- src/langs/portbr.h | 4 +- src/langs/romanian.h | 4 +- src/langs/spanish.h | 4 +- src/main.c | 4 +- src/moon.c | 4 +- src/omit.c | 4 +- src/os2func.c | 4 +- src/protos.h | 4 +- src/queue.c | 18 +- src/rem2ps.c | 4 +- src/rem2ps.h | 4 +- src/sort.c | 4 +- src/token.c | 4 +- src/trigger.c | 4 +- src/types.h | 4 +- src/userfns.c | 4 +- src/utils.c | 4 +- src/var.c | 4 +- src/version.h | 4 +- tests/test-rem | 6 +- tests/test-rem.bat | 6 +- tests/test-rem.cmd | 6 +- tests/tstlang.rem | 6 +- www/cal_dispatch-DIST | 4 +- www/calps | 4 +- www/hebdate | 4 +- www/hebdate.rem-DIST | 4 +- www/hebhtml | 4 +- www/hebps | 4 +- www/moon | 4 +- www/moon.rem-DIST | 4 +- www/sunrise | 4 +- www/sunrise.rem-DIST | 4 +- www/sunset | 4 +- www/sunset.rem-DIST | 4 +- 81 files changed, 587 insertions(+), 340 deletions(-) diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS index bb53e55a..8d1a237a 100644 --- a/ACKNOWLEDGEMENTS +++ b/ACKNOWLEDGEMENTS @@ -1,4 +1,4 @@ -$Id: ACKNOWLEDGEMENTS,v 1.1 1998-01-19 03:33:34 dfs Exp $ +$Id: ACKNOWLEDGEMENTS,v 1.2 2000-02-18 03:45:11 dfs Exp $ I would like to thank the following people: @@ -45,7 +45,7 @@ Finally, all those who donated money to support the production of REMIND. Your donations were gratefully appreciated. -- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA diff --git a/COPYRIGHT b/COPYRIGHT index eed558a3..2edcff12 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,10 +1,10 @@ -$Id: COPYRIGHT,v 1.11 1999-04-05 17:34:27 dfs Exp $ +$Id: COPYRIGHT,v 1.12 2000-02-18 03:45:12 dfs Exp $ THE REMIND COPYRIGHT 1. REMIND refers to the entire set of files and documentation in the REMIND package. -2. REMIND is Copyright 1999 by Roaring Penguin Software Inc., +2. REMIND is Copyright 1999-2000 Roaring Penguin Software Inc., except where noted in individual files. 3. DISTRIBUTION AND USE diff --git a/README b/README index 9dc5bbe9..533d2d10 100644 --- a/README +++ b/README @@ -31,4 +31,7 @@ If you do NOT have Tcl/Tk or are NOT running X Windows: 4) Type: "make install" -- you may need to be root to do this. -$Id: README,v 1.4 1998-01-19 03:24:03 dfs Exp $ \ No newline at end of file +$Id: README,v 1.5 2000-02-18 03:45:13 dfs Exp $ + +Contact info: mailto:dfs@roaringpenguin.com +Home page: http://www.roaringpenguin.com/remind.html diff --git a/build.tk b/build.tk index bc25d759..87ba9983 100755 --- a/build.tk +++ b/build.tk @@ -7,12 +7,12 @@ # A cheesy graphical front-end for building and installing REMIND. # # This file is part of REMIND. -# Copyright (C) 1992-1999 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1992-1999 David F. Skoll +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # #-------------------------------------------------------------- -# $Id: build.tk,v 1.9 1999-04-13 01:24:40 dfs Exp $ +# $Id: build.tk,v 1.10 2000-02-18 03:45:14 dfs Exp $ # the next line restarts using wish \ exec wish "$0" "$@" diff --git a/configure b/configure index 20c054dc..7e4a987a 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.10 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -49,6 +49,9 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option @@ -330,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.10" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -432,11 +435,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h @@ -497,8 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -528,14 +537,16 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:541: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -556,15 +567,17 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:571: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -599,10 +612,92 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:622: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:654: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 665 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:696: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:701: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -611,7 +706,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -619,33 +714,46 @@ fi fi echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + if test $ac_cv_prog_gcc = yes; then GCC=yes - if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:729: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes + ac_cv_prog_cc_g=yes else - ac_cv_prog_gcc_g=no + ac_cv_prog_cc_g=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi ac_aux_dir= @@ -674,27 +782,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:791: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -705,7 +816,7 @@ else ;; esac done - IFS="$ac_save_ifs" + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then @@ -724,9 +835,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:844: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +861,8 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -set dummy ${MAKE-make}; ac_make=$2 +echo "configure:865: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -774,30 +889,32 @@ fi -echo $ac_n "checking for -lm""... $ac_c" 1>&6 -ac_lib_var=`echo m'_'sqrt | tr './+\055' '__p_'` +echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 +echo "configure:894: checking for sqrt in -lm" >&5 +ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -807,7 +924,8 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 +echo "configure:942: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -834,38 +953,61 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP=/lib/cpp fi rm -f conftest* fi +rm -f conftest* +fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi @@ -875,38 +1017,13 @@ else fi echo "$ac_t""$CPP" 1>&6 -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes -else -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_cross=no -else - ac_cv_c_cross=yes -fi -fi -rm -fr conftest* -fi - -echo "$ac_t""$ac_cv_c_cross" 1>&6 -cross_compiling=$ac_cv_c_cross - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1022: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -914,13 +1031,15 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_stdc=no fi @@ -929,7 +1048,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -947,7 +1066,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -967,8 +1086,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else -cat > conftest.$ac_ext < conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -979,14 +1098,18 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -{ (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_header_stdc=no fi -fi rm -fr conftest* +fi + fi fi @@ -998,26 +1121,29 @@ EOF fi -for ac_hdr in sys/file.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h +for ac_hdr in sys/file.h sys/select.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1129: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1025,7 +1151,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 +echo "configure:1167: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_c_const=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_c_const" 1>&6 @@ -1111,28 +1238,29 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +echo "configure:1242: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -int main() { return 0; } -int t() { +int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_struct_tm=sys/time.h fi rm -f conftest* - fi echo "$ac_t""$ac_cv_struct_tm" 1>&6 @@ -1145,11 +1273,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +echo "configure:1277: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1162,20 +1291,20 @@ extern "C" void (*signal (int, void (*)(int)))(int); void (*signal ()) (); #endif -int main() { return 0; } -int t() { +int main() { int i; ; return 0; } EOF -if { (eval echo configure:1171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_type_signal=int fi rm -f conftest* - fi echo "$ac_t""$ac_cv_type_signal" 1>&6 @@ -1185,19 +1314,21 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +echo "configure:1318: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include +#include #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -1216,11 +1347,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:1351: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1249,6 +1381,7 @@ EOF fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 +echo "configure:1385: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1257,8 +1390,8 @@ else if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else -cat > conftest.$ac_ext < conftest.$ac_ext < #include @@ -1269,14 +1402,18 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -{ (eval echo configure:1273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then ac_cv_func_utime_null=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_func_utime_null=no fi -fi rm -fr conftest* +fi + rm -f core core.* *.core fi @@ -1289,29 +1426,30 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +echo "configure:1430: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include #include -int main() { return 0; } -int t() { +int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_time=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_header_time" 1>&6 @@ -1323,11 +1461,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +echo "configure:1465: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_vprintf=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1373,11 +1513,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:1517: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func__doprnt=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1426,11 +1568,12 @@ fi for ac_func in mktime putenv strstr timegm difftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1572: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@ -1494,11 +1638,25 @@ cat > confcache <<\EOF # --recheck option to rerun configure. # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ - >> confcache + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : else @@ -1553,7 +1711,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.10" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1573,9 +1731,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -1596,6 +1756,7 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LN_S@%$LN_S%g s%@SET_MAKE@%$SET_MAKE%g @@ -1603,20 +1764,56 @@ s%@CPP@%$CPP%g CEOF EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac - # Adjust relative srcdir, etc. for subdirectories. + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` @@ -1644,6 +1841,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac + echo creating "$ac_file" rm -f "$ac_file" configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." @@ -1652,14 +1850,16 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # $configure_input" ;; *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f conftest.subs +rm -f conftest.s* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. @@ -1680,11 +1880,17 @@ ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' -CONFIG_HEADERS=${CONFIG_HEADERS-"src/config.h"} +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac @@ -1692,7 +1898,8 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - cp $ac_given_srcdir/$ac_file_in conftest.in + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF @@ -1720,8 +1927,6 @@ EOF # Break up conftest.vals because some shells have a limit on # the size of here documents, and old seds have small limits too. -# Maximum number of lines to put in a single here document. -ac_max_here_lines=12 rm -f conftest.tail while : @@ -1763,7 +1968,11 @@ cat >> $CONFIG_STATUS <<\EOF fi fi; done +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/configure.in b/configure.in index a2a606da..0bc89e89 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.5 1998-02-16 03:41:39 dfs Exp $ +dnl $Id: configure.in,v 1.6 2000-02-18 03:45:16 dfs Exp $ AC_INIT(src/amiga.c) @@ -28,7 +28,7 @@ AC_CHECK_LIB(m, sqrt) dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(sys/file.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h) +AC_CHECK_HEADERS(sys/file.h sys/select.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/docs/README.AMIGA b/docs/README.AMIGA index 6af0a38b..1d5d9297 100644 --- a/docs/README.AMIGA +++ b/docs/README.AMIGA @@ -1,6 +1,9 @@ -$Id: README.AMIGA,v 1.2 1998-01-17 04:50:33 dfs Exp $ +$Id: README.AMIGA,v 1.3 2000-02-18 03:45:29 dfs Exp $ REMIND version 3.0 for AmigaDOS +I DO NOT SUPPORT REMIND ON AmigaDOS. THE AmigaDOS PORT HAS NOT BEEN MAINTAINED +FOR QUITE A WHILE. + REMIND is a sophisticated alarm/calendar program. Details are given in the man page, "remind.1". @@ -20,12 +23,12 @@ This will create remind, which is ready to be executed. See README.UNIX for more info. - -- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA Tel. (613) 225-8687 +http://www.roaringpenguin.com/remind.html diff --git a/docs/README.BCC b/docs/README.BCC index 573a7e9e..c120307f 100644 --- a/docs/README.BCC +++ b/docs/README.BCC @@ -1,4 +1,4 @@ -$Id: README.BCC,v 1.2 1998-01-17 04:50:33 dfs Exp $ +$Id: README.BCC,v 1.3 2000-02-18 03:45:30 dfs Exp $ REMIND version 3.0 for Borland C++ IMPORTANT NOTE: BCC SUPPORT MAY BE BROKEN. I DON'T CARE. I'M NOT @@ -24,10 +24,10 @@ directories. See README.UNIX for more info. -- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA Tel. (613) 225-8687 - +http://www.roaringpenguin.com/remind.html diff --git a/docs/README.DOS b/docs/README.DOS index 6f923fdc..2b0b3780 100644 --- a/docs/README.DOS +++ b/docs/README.DOS @@ -1,4 +1,4 @@ -$Id: README.DOS,v 1.2 1998-01-17 04:50:33 dfs Exp $ +$Id: README.DOS,v 1.3 2000-02-18 03:45:31 dfs Exp $ REMIND version 3.0 for MS-DOS IMPORTANT NOTE: DOS SUPPORT MAY BE BROKEN. I DON'T CARE. I NO LONGER @@ -29,10 +29,10 @@ as well as U.S. and Jewish holidays. See README.UNIX for more info. -- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA Tel. (613) 225-8687 - +http://www.roaringpenguin.com/remind.html diff --git a/docs/README.OS2 b/docs/README.OS2 index 4bf0a6fd..03023306 100644 --- a/docs/README.OS2 +++ b/docs/README.OS2 @@ -1,6 +1,9 @@ -$Id: README.OS2,v 1.2 1998-01-17 04:50:34 dfs Exp $ +$Id: README.OS2,v 1.3 2000-02-18 03:45:32 dfs Exp $ REMIND version 3.0 for OS/2 +I DO NOT SUPPORT REMIND ON OS/2. THE OS/2 PORT HAS NOT BEEN MAINTAINED +FOR QUITE A WHILE. + This file contains instructions for compiling Remind under OS/2 with Eberhard Mattes' emx/gcc compiler and with the Microsoft C compiler. There are a number of targets in Makefile.os2, including OS/2-only @@ -99,11 +102,13 @@ exit See README.UNIX for some more information about Remind. --- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA Tel. (613) 225-8687 +http://www.roaringpenguin.com/remind.html + + diff --git a/docs/README.UNIX b/docs/README.UNIX index 24fbb95a..6bebdcca 100644 --- a/docs/README.UNIX +++ b/docs/README.UNIX @@ -1,4 +1,4 @@ -$Id: README.UNIX,v 1.4 1998-01-19 03:24:09 dfs Exp $ +$Id: README.UNIX,v 1.5 2000-02-18 03:45:33 dfs Exp $ REMIND version 3.0 for UNIX REMIND is a sophisticated alarm/calendar program. Details are given @@ -125,9 +125,10 @@ exit -- -David F. Skoll +David F. Skoll 986 Eiffel Avenue Ottawa, Ontario K2C 0J2 CANADA Tel. (613) 225-8687 +http://www.roaringpenguin.com/remind.html \ No newline at end of file diff --git a/docs/README_QDOS b/docs/README_QDOS index 912d44d8..fd731460 100644 --- a/docs/README_QDOS +++ b/docs/README_QDOS @@ -1,6 +1,9 @@ -$Id: README_QDOS,v 1.3 1998-03-01 20:43:04 dfs Exp $ +$Id: README_QDOS,v 1.4 2000-02-18 03:45:34 dfs Exp $ REMIND version 3.0.19 for QDOS / SMSQ +I DO NOT SUPPORT REMIND ON QDOS. THE QDOS PORT HAS NOT BEEN MAINTAINED +FOR QUITE A WHILE. + REMIND is a sophisticated alarm/calendar program. Details are given in the documentation file, "remind_doc" (QUILL format). [Note from David Skoll -- I was not sent the file `remind_doc', so diff --git a/docs/WHATSNEW.30 b/docs/WHATSNEW.30 index 29a2c69f..cadd9470 100644 --- a/docs/WHATSNEW.30 +++ b/docs/WHATSNEW.30 @@ -4,6 +4,8 @@ CHANGES TO REMIND + MINOR ENHANCEMENTS +- Updated copyright years and contact info. + - Changed GIF images to PNG to avoid patent problems. - Added "cm2trem.tcl" to convert from CDE's "cm" calendar manager to Remind @@ -16,11 +18,15 @@ CHANGES TO REMIND - Added "remind.vim" file for Vim syntax highlighting of Remind files, thanks to Davide Alberani. +- Added "dusk" and "dawn" built-in functions, thanks to Ron Aaron. + + BUG FIXES - Fixed typo which caused compilation failure on compilers without function prototypes. Thanks to Ian Darwin for the patch. +- Fixed compilation problem on FreeBSD. + * Version 3.0 Patch 20 + NEWS diff --git a/examples/defs.rem b/examples/defs.rem index 72cf23a5..f7ac9dda 100644 --- a/examples/defs.rem +++ b/examples/defs.rem @@ -17,13 +17,13 @@ # "#COLORS" for examples of ANSI color escape sequences. # # # # This file is part of REMIND. # -# Copyright (C) 1992-1997 by David F. Skoll # -# Copyright (C) 1999 by Roaring Penguin Software Inc. # +# Copyright (C) 1992-1997 David F. Skoll # +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # # # ############################################################################# # -# $Id: defs.rem,v 1.3 1999-04-05 17:34:38 dfs Exp $ +# $Id: defs.rem,v 1.4 2000-02-18 03:45:36 dfs Exp $ # RUN OFF diff --git a/man/remind.1 b/man/remind.1 index a8580131..29c0c249 100644 --- a/man/remind.1 +++ b/man/remind.1 @@ -1,5 +1,5 @@ -.\" $Id: remind.1,v 1.10 1999-04-13 01:46:19 dfs Exp $ -.TH REMIND 1 "1 February 1998" +.\" $Id: remind.1,v 1.11 2000-02-18 03:45:37 dfs Exp $ +.TH REMIND 1 "17 February 2000" .UC 4 .SH NAME remind \- a sophisticated reminder service @@ -1068,7 +1068,7 @@ is similar to \fB%3\fR but displays the current time. .TP .B %" -(percent-doublequote) is removed. This sequence is not +(percent-doublequote - ") is removed. This sequence is not used by the substitution filter, but is used to tell \fBRemind\fR which text to include in a calendar entry when the \fB\-c\fR, \fB\-s\fR or \fB\-p\fR option is chosen. @@ -1885,6 +1885,10 @@ converted using the reverse of procedures described above. A The \fBdate()\fR function returns a \fBDATE\fR object with the year, month and day components specified by \fIy\fR, \fIm\fR and \fId\fR. .TP +.B dawn([d_date]) +Returns the time of "civil dawn" on the specified \fIdate\fR. If \fIdate\fR +is omitted, defaults to \fBtoday()\fR. +.TP .B day(d_date) This function takes a \fBDATE\fR as an argument, and returns an \fBINT\fR which is the day-of-month component of \fIdate\fR. @@ -1929,6 +1933,10 @@ will produce undefined results. \fBRemind\fR. .RE .TP +.B dusk([d_date]) +Returns the time of "civil twilight" on the specified \fIdate\fR. If +\fIdate\fR is omitted, defaults to \fBtoday()\fR. +.TP .B easterdate(di_arg) If \fIarg\fR is an \fBINT\fR, then returns the date of Easter Sunday for the specified year. If \fIarg\fR is a \fBDATE\fR, then returns the diff --git a/scripts/cm2rem.tcl b/scripts/cm2rem.tcl index 5a2accbd..152ec63e 100755 --- a/scripts/cm2rem.tcl +++ b/scripts/cm2rem.tcl @@ -9,11 +9,11 @@ # # This file is part of REMIND. # Copyright (C) 1992-1998 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. # #-------------------------------------------------------------- -# $Id: cm2rem.tcl,v 1.2 1999-08-30 16:28:01 dfs Exp $ +# $Id: cm2rem.tcl,v 1.3 2000-02-18 03:45:38 dfs Exp $ # the next line restarts using tclsh \ exec tclsh "$0" "$@" diff --git a/scripts/remind-all.sh b/scripts/remind-all.sh index f13ba19c..f6e7ed25 100644 --- a/scripts/remind-all.sh +++ b/scripts/remind-all.sh @@ -3,10 +3,10 @@ # This file is part of REMIND # -# $Id: remind-all.sh,v 1.3 1999-04-05 17:34:40 dfs Exp $ +# $Id: remind-all.sh,v 1.4 2000-02-18 03:45:39 dfs Exp $ # # REMIND is Copyright (C) 1992-1998 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # This file is Copyright (C) 1990 by Bill Aten # Thanks to Bill Aten for this script. diff --git a/scripts/tkremind b/scripts/tkremind index 1a5f75bc..fc3579be 100755 --- a/scripts/tkremind +++ b/scripts/tkremind @@ -7,12 +7,12 @@ # A cheesy graphical front/back end for Remind using Tcl/Tk # # This file is part of REMIND. -# Copyright (C) 1992-1998 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1992-1998 David F. Skoll +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # #-------------------------------------------------------------- -# $Id: tkremind,v 1.26 1999-04-13 01:39:33 dfs Exp $ +# $Id: tkremind,v 1.27 2000-02-18 03:45:40 dfs Exp $ # the next line restarts using wish \ exec wish "$0" "$@" diff --git a/src/Makefile.in b/src/Makefile.in index dfd88c06..943b703f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in for REMIND # -# $Id: Makefile.in,v 1.13 1999-10-18 19:55:00 dfs Exp $ +# $Id: Makefile.in,v 1.14 2000-02-18 03:45:41 dfs Exp $ VERSION= 03.00.21 SHELL= /bin/sh @@ -40,7 +40,7 @@ test: remind sh ../tests/test-rem .c.o: - @CC@ -c @CFLAGS@ @DEFS@ $(LANGDEF) -DUNIX -I. -I$(srcdir) $< + @CC@ -c @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -DUNIX -I. -I$(srcdir) $< rem2ps: rem2ps.o dynbuf.o @CC@ @LDFLAGS@ -o rem2ps rem2ps.o dynbuf.o @@ -75,14 +75,13 @@ tgz: ln -s .. remind-$(VERSION) peekentry `find remind-$(VERSION) -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION).tar gzip -v -9 remind-$(VERSION).tar - mv remind-$(VERSION).tar.gz remind-$(VERSION).tgz + mv remind-$(VERSION).tar.gz rm -f remind-$(VERSION) beta-tgz: ln -s .. remind-$(VERSION)-BETA peekentry `find remind-$(VERSION)-BETA -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION)-BETA.tar gzip -v -9 remind-$(VERSION)-BETA.tar - mv remind-$(VERSION)-BETA.tar.gz remind-$(VERSION)-BETA.tgz rm -f remind-$(VERSION)-BETA #---------------- Stuff after this added by "make depend" ----------------- diff --git a/src/amiga.c b/src/amiga.c index b449f58e..6b519c55 100644 --- a/src/amiga.c +++ b/src/amiga.c @@ -8,11 +8,11 @@ /* */ /* This file is part of REMIND. */ /* Remind is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: amiga.c,v 1.3 1999-04-05 17:34:42 dfs Exp $"; +static char const RCSID[] = "$Id: amiga.c,v 1.4 2000-02-18 03:45:42 dfs Exp $"; #include #include diff --git a/src/calendar.c b/src/calendar.c index 1f575627..776c3cf2 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -6,12 +6,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: calendar.c,v 1.8 1999-04-05 17:34:42 dfs Exp $"; +static char const RCSID[] = "$Id: calendar.c,v 1.9 2000-02-18 03:45:43 dfs Exp $"; #include #include diff --git a/src/config.h.in b/src/config.h.in index 33f5981f..11dd39c9 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,6 +1,6 @@ /* src/config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.3 1998-02-16 03:41:44 dfs Exp $ */ +/* $Id: config.h.in,v 1.4 2000-02-18 03:45:44 dfs Exp $ */ /* Define to empty if the keyword does not work. */ #undef const @@ -68,6 +68,9 @@ /* Define if you have the header file. */ #undef HAVE_SYS_TIME_H +/* Define if you have the header file. */ +#undef HAVE_SYS_SELECT_H + /* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H diff --git a/src/custom.h.in b/src/custom.h.in index d20969ef..a41fefaa 100644 --- a/src/custom.h.in +++ b/src/custom.h.in @@ -7,11 +7,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: custom.h.in,v 1.6 1999-04-05 17:34:43 dfs Exp $ */ +/* $Id: custom.h.in,v 1.7 2000-02-18 03:45:46 dfs Exp $ */ /*---------------------------------------------------------------------*/ /* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location */ @@ -229,11 +229,6 @@ #define PUBLIC #define PRIVATE static -#ifdef UNIX -#define _POSIX_SOURCE -#define _SVID_SOURCE -#endif - #define PSBEGIN "# rem2ps begin" #define PSEND "# rem2ps end" diff --git a/src/dorem.c b/src/dorem.c index c5593e4d..00eda353 100644 --- a/src/dorem.c +++ b/src/dorem.c @@ -8,12 +8,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: dorem.c,v 1.8 1999-04-05 17:34:44 dfs Exp $"; +static char const RCSID[] = "$Id: dorem.c,v 1.9 2000-02-18 03:45:47 dfs Exp $"; #include #include diff --git a/src/dosubst.c b/src/dosubst.c index ad744859..c0b97aa8 100644 --- a/src/dosubst.c +++ b/src/dosubst.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: dosubst.c,v 1.9 1999-04-05 17:34:44 dfs Exp $"; +static char const RCSID[] = "$Id: dosubst.c,v 1.10 2000-02-18 03:45:48 dfs Exp $"; #define L_IN_DOSUBST #include @@ -32,7 +32,7 @@ static char const RCSID[] = "$Id: dosubst.c,v 1.9 1999-04-05 17:34:44 dfs Exp $" #include "types.h" #include "protos.h" -#define UPPER(c) (islower(c) ? toupper(c) : c) +#define UPPER(c) (islower(c) ? toupper(c) : (c)) #define ABS(x) ( (x) < 0 ? -(x) : (x) ) #ifndef NL #define NL "\n" diff --git a/src/dynbuf.c b/src/dynbuf.c index 72c0ab96..009fd1ce 100644 --- a/src/dynbuf.c +++ b/src/dynbuf.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ static char const RCSID[] = -"$Id: dynbuf.c,v 1.4 1999-04-21 01:48:00 dfs Exp $"; +"$Id: dynbuf.c,v 1.5 2000-02-18 03:45:49 dfs Exp $"; #include "config.h" #include "dynbuf.h" diff --git a/src/dynbuf.h b/src/dynbuf.h index 5859821b..dabc963d 100644 --- a/src/dynbuf.h +++ b/src/dynbuf.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: dynbuf.h,v 1.2 1999-04-05 17:34:45 dfs Exp $ */ +/* $Id: dynbuf.h,v 1.3 2000-02-18 03:45:50 dfs Exp $ */ #ifndef DYNBUF_H #define DYNBUF_H diff --git a/src/err.h b/src/err.h index 19e78519..a8ab5ec6 100644 --- a/src/err.h +++ b/src/err.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: err.h,v 1.3 1999-04-05 17:34:46 dfs Exp $ */ +/* $Id: err.h,v 1.4 2000-02-18 03:45:51 dfs Exp $ */ /* Note that not all of the "errors" are really errors - some are just messages for information purposes. Constants beginning with M_ should diff --git a/src/expr.c b/src/expr.c index 2657ca12..70dafcab 100644 --- a/src/expr.c +++ b/src/expr.c @@ -6,12 +6,12 @@ /* expressions. */ /* */ /* Copyright 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: expr.c,v 1.7 1999-04-05 17:34:46 dfs Exp $"; +static char const RCSID[] = "$Id: expr.c,v 1.8 2000-02-18 03:45:52 dfs Exp $"; #include #include diff --git a/src/expr.h b/src/expr.h index f70bcfcf..be2d4058 100644 --- a/src/expr.h +++ b/src/expr.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: expr.h,v 1.3 1999-04-05 17:34:48 dfs Exp $ */ +/* $Id: expr.h,v 1.4 2000-02-18 03:45:53 dfs Exp $ */ /* Define the types of values */ #define ERR_TYPE 0 diff --git a/src/files.c b/src/files.c index e5267002..f5da8bd1 100644 --- a/src/files.c +++ b/src/files.c @@ -8,12 +8,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: files.c,v 1.9 1999-04-05 17:34:48 dfs Exp $"; +static char const RCSID[] = "$Id: files.c,v 1.10 2000-02-18 03:45:54 dfs Exp $"; #include diff --git a/src/funcs.c b/src/funcs.c index 168a93f8..08bb1f23 100644 --- a/src/funcs.c +++ b/src/funcs.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: funcs.c,v 1.8 2000-02-18 03:08:18 dfs Exp $"; +static char const RCSID[] = "$Id: funcs.c,v 1.9 2000-02-18 03:45:55 dfs Exp $"; #include @@ -1015,7 +1015,10 @@ static int FUpper() if (ARG(0).type != STR_TYPE) return E_BAD_TYPE; DCOPYVAL(RetVal, ARG(0)); s = RetVal.v.str; - while (*s) { *s = UPPER(*s); s++; } + while (*s) { + *s = UPPER(*s); + s++; + } return OK; } @@ -1030,7 +1033,10 @@ static int FLower() if (ARG(0).type != STR_TYPE) return E_BAD_TYPE; DCOPYVAL(RetVal, ARG(0)); s = RetVal.v.str; - while (*s) { *s = LOWER(*s); s++; } + while (*s) { + *s = LOWER(*s); + s++; + } return OK; } @@ -2018,7 +2024,7 @@ int jul; int year, mon, day; int jan0; int mins, hours; - int dusk_or_dawn; + int dusk_or_dawn; double M, L, tanA, sinDelta, cosDelta, a, a_hr, cosH, t, H, T; double latitude, longdeg, UT, local; @@ -2042,9 +2048,9 @@ int jul; FromJulian(jul, &year, &mon, &day); jan0 = jul - Julian(year, 0, 1); - dusk_or_dawn = rise; - if (rise > 1) - rise -= 2; + dusk_or_dawn = rise; + if (rise > 1) + rise -= 2; /* Following formula on page B6 exactly... */ t = (double) jan0; if (rise) t += (6.0 + longdeg/15.0) / 24.0; @@ -2055,13 +2061,11 @@ int jul; /* Sun's true longitude */ L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 282.565; - if (dusk_or_dawn == 2) // dusk - { - L += 6; - } else if (dusk_or_dawn == 3) // dawn - { - L -= 14; - } + if (dusk_or_dawn == 2) {/* dusk */ + L += 6; + } else if (dusk_or_dawn == 3) {/* dawn */ + L -= 14; + } if (L > 360.0) L -= 360.0; /* Tan of sun's right ascension */ @@ -2080,7 +2084,7 @@ int jul; } /* if (fabs(a - L) > 90.0) a += 180.0; */ - + if (a > 360.0) a -= 360.0; a_hr = a / 15.0; @@ -2088,10 +2092,10 @@ int jul; /* Sine of sun's declination */ sinDelta = 0.39782 * sin(DEGRAD*L); cosDelta = sqrt(1 - sinDelta*sinDelta); - + /* Cosine of sun's local hour angle */ cosH = (cosz - sinDelta * sin(latitude)) / (cosDelta * cos(latitude)); - + if (cosH < -1.0) { /* Summer -- permanent daylight */ if (rise) return NO_TIME; else return -NO_TIME; @@ -2107,9 +2111,9 @@ int jul; T = H / 15.0 + a_hr - 0.065710*t - 6.620; if (T >= 24.0) T -= 24.0; else if (T < 0.0) T+= 24.0; - + UT = T + longdeg / 15.0; - + local = UT + (double) mins / 60.0; if (local < 0.0) local += 24.0; @@ -2117,7 +2121,7 @@ int jul; hours = (int) local; mins = (int) ((local - hours) * 60.0); - + /* Sometimes, we get roundoff error. Check for "reasonableness" of answer. */ if (rise) { diff --git a/src/globals.c b/src/globals.c index a21af467..ccaafbca 100644 --- a/src/globals.c +++ b/src/globals.c @@ -9,12 +9,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: globals.c,v 1.3 1999-04-05 17:34:50 dfs Exp $"; +static char const RCSID[] = "$Id: globals.c,v 1.4 2000-02-18 03:45:56 dfs Exp $"; #include /* For defintion of FILE - sigh! */ #include "types.h" diff --git a/src/globals.h b/src/globals.h index aef10797..d0d68b62 100644 --- a/src/globals.h +++ b/src/globals.h @@ -8,11 +8,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: globals.h,v 1.6 1999-04-05 17:34:50 dfs Exp $ */ +/* $Id: globals.h,v 1.7 2000-02-18 03:45:57 dfs Exp $ */ #ifdef MK_GLOBALS #undef EXTERN diff --git a/src/hbcal.c b/src/hbcal.c index 8a9ec001..f0f0be11 100644 --- a/src/hbcal.c +++ b/src/hbcal.c @@ -6,7 +6,7 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /* Derived from code written by Amos Shapir in 1978; revised */ /* 1985. */ @@ -14,7 +14,7 @@ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: hbcal.c,v 1.3 1999-04-05 17:34:50 dfs Exp $"; +static char const RCSID[] = "$Id: hbcal.c,v 1.4 2000-02-18 03:45:58 dfs Exp $"; #include /* For FILE used by protos.h - sigh. */ #include "types.h" diff --git a/src/init.c b/src/init.c index 6b107c02..c8bf8208 100644 --- a/src/init.c +++ b/src/init.c @@ -8,12 +8,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: init.c,v 1.11 1999-04-12 19:45:27 dfs Exp $"; +static char const RCSID[] = "$Id: init.c,v 1.12 2000-02-18 03:45:59 dfs Exp $"; #define L_IN_INIT 1 #include diff --git a/src/lang.h b/src/lang.h index a3d9a390..017901ca 100644 --- a/src/lang.h +++ b/src/lang.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: lang.h,v 1.4 1999-04-05 17:34:51 dfs Exp $ */ +/* $Id: lang.h,v 1.5 2000-02-18 03:46:00 dfs Exp $ */ /* I'm chauvinistic and name each language with its English name... */ @@ -27,7 +27,7 @@ #define ROMANIAN 10 /* translated by Liviu Daia */ #define SPANISH 11 /* translated by Rafa Couto */ -/* Add more languages here - but please e-mail aa775@freenet.carleton.ca +/* Add more languages here - but please e-mail dfs@roaringpenguin.com to have your favorite language assigned a number. If you add a language, please send me the header file, and permission to include it in future releases of Remind. Note that you'll get no remuneration diff --git a/src/langs/danish.h b/src/langs/danish.h index 9ec69f62..0a622098 100644 --- a/src/langs/danish.h +++ b/src/langs/danish.h @@ -7,12 +7,12 @@ /* This file is part of REMIND. */ /* */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* This file is Copyright (C) 1993 by Mogens Lynnerup. */ /* */ /***************************************************************/ -/* $Id: danish.h,v 1.6 1999-04-05 17:35:05 dfs Exp $ */ +/* $Id: danish.h,v 1.7 2000-02-18 03:46:17 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Danish" diff --git a/src/langs/dutch.h b/src/langs/dutch.h index 8fe05d31..8cd332c9 100644 --- a/src/langs/dutch.h +++ b/src/langs/dutch.h @@ -12,11 +12,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: dutch.h,v 1.4 1999-04-05 17:35:06 dfs Exp $ */ +/* $Id: dutch.h,v 1.5 2000-02-18 03:46:18 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Dutch" diff --git a/src/langs/english.h b/src/langs/english.h index 3395af0a..c0753c62 100644 --- a/src/langs/english.h +++ b/src/langs/english.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: english.h,v 1.4 1999-04-05 17:35:06 dfs Exp $ */ +/* $Id: english.h,v 1.5 2000-02-18 03:46:19 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "English" diff --git a/src/langs/finnish.h b/src/langs/finnish.h index e5cbc1be..8199bb8b 100644 --- a/src/langs/finnish.h +++ b/src/langs/finnish.h @@ -12,11 +12,11 @@ /* This file is part of REMIND. */ /* This file is Copyright (C) 1993-1998 by Mikko Silvonen. */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: finnish.h,v 1.8 1999-04-12 19:45:41 dfs Exp $ */ +/* $Id: finnish.h,v 1.9 2000-02-18 03:46:20 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Finnish" diff --git a/src/langs/french.h b/src/langs/french.h index 29c38f18..0f8e7fe8 100644 --- a/src/langs/french.h +++ b/src/langs/french.h @@ -9,13 +9,13 @@ /* This file is part of REMIND. */ /* */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* This file is Copyright (C) 1993 by Laurent Duperval and */ /* David F. Skoll. */ /* */ /***************************************************************/ -/* $Id: french.h,v 1.7 1999-04-12 19:45:42 dfs Exp $ */ +/* $Id: french.h,v 1.8 2000-02-18 03:46:21 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "French" diff --git a/src/langs/german.h b/src/langs/german.h index 7097e4e5..6325aed9 100644 --- a/src/langs/german.h +++ b/src/langs/german.h @@ -10,11 +10,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: german.h,v 1.5 1999-04-05 17:35:08 dfs Exp $ */ +/* $Id: german.h,v 1.6 2000-02-18 03:46:22 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "German" diff --git a/src/langs/italian.h b/src/langs/italian.h index 8214f136..95e0bda2 100644 --- a/src/langs/italian.h +++ b/src/langs/italian.h @@ -8,11 +8,11 @@ /* It is Copyright (C) 1996 by Valerio Aimale */ /* */ /* Remind is copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: italian.h,v 1.5 1999-04-05 17:35:09 dfs Exp $ */ +/* $Id: italian.h,v 1.6 2000-02-18 03:46:23 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Italian" diff --git a/src/langs/norwgian.h b/src/langs/norwgian.h index 0a552684..17cfdc13 100644 --- a/src/langs/norwgian.h +++ b/src/langs/norwgian.h @@ -7,11 +7,11 @@ /* This file is part of REMIND. */ /* This file is Copyright (C) 1993 by Trygve Randen. */ /* Remind is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: norwgian.h,v 1.5 1999-04-05 17:35:09 dfs Exp $ */ +/* $Id: norwgian.h,v 1.6 2000-02-18 03:46:24 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Norwegian" diff --git a/src/langs/polish.h b/src/langs/polish.h index b4fc2a99..fc85e38c 100644 --- a/src/langs/polish.h +++ b/src/langs/polish.h @@ -10,11 +10,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: polish.h,v 1.7 1999-04-12 19:45:43 dfs Exp $ */ +/* $Id: polish.h,v 1.8 2000-02-18 03:46:25 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Polish" diff --git a/src/langs/portbr.h b/src/langs/portbr.h index fc5b1d5e..de81436b 100644 --- a/src/langs/portbr.h +++ b/src/langs/portbr.h @@ -9,13 +9,13 @@ /* This file is part of REMIND. */ /* */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* This file is Copyright (C) 1996 by Marco Paganini and */ /* David F. Skoll. */ /* */ /***************************************************************/ -/* $Id: portbr.h,v 1.6 1999-04-12 19:45:43 dfs Exp $ */ +/* $Id: portbr.h,v 1.7 2000-02-18 03:46:26 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Brazilian Portuguese" diff --git a/src/langs/romanian.h b/src/langs/romanian.h index 026a65ac..48fb78e6 100644 --- a/src/langs/romanian.h +++ b/src/langs/romanian.h @@ -9,12 +9,12 @@ /* This file is part of REMIND. */ /* */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* This file is Copyright (C) 1996-1998 by Liviu Daia */ /* */ /***************************************************************/ -/* $Id: romanian.h,v 1.5 1999-04-05 17:35:10 dfs Exp $ */ +/* $Id: romanian.h,v 1.6 2000-02-18 03:46:27 dfs Exp $ */ /* The very first define in a language support file must be L_LANGNAME: */ #define L_LANGNAME "Romanian" diff --git a/src/langs/spanish.h b/src/langs/spanish.h index d417ba43..701d8c5c 100644 --- a/src/langs/spanish.h +++ b/src/langs/spanish.h @@ -8,11 +8,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright 1999 by Roaring Penguin Software Inc. */ +/* Copyright 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: spanish.h,v 1.2 1999-04-05 17:35:11 dfs Exp $ */ +/* $Id: spanish.h,v 1.3 2000-02-18 03:46:28 dfs Exp $ */ #define L_LANGNAME "Spanish" diff --git a/src/main.c b/src/main.c index faaf1c1f..077bb5f8 100644 --- a/src/main.c +++ b/src/main.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: main.c,v 1.10 1999-04-05 17:34:52 dfs Exp $"; +static char const RCSID[] = "$Id: main.c,v 1.11 2000-02-18 03:46:01 dfs Exp $"; #ifdef HAVE_STDLIB_H #include diff --git a/src/moon.c b/src/moon.c index a4216ad9..165c2539 100644 --- a/src/moon.c +++ b/src/moon.c @@ -6,12 +6,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: moon.c,v 1.4 1999-04-05 17:34:53 dfs Exp $"; +static char const RCSID[] = "$Id: moon.c,v 1.5 2000-02-18 03:46:02 dfs Exp $"; /* All of these routines were adapted from the program "moontool" by John Walker, February 1988. Here's the blurb from moontool: diff --git a/src/omit.c b/src/omit.c index 2e2d5341..4e8ab4a2 100644 --- a/src/omit.c +++ b/src/omit.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: omit.c,v 1.5 1999-04-05 17:34:54 dfs Exp $"; +static char const RCSID[] = "$Id: omit.c,v 1.6 2000-02-18 03:46:03 dfs Exp $"; #include diff --git a/src/os2func.c b/src/os2func.c index 4ec08be1..05de0665 100644 --- a/src/os2func.c +++ b/src/os2func.c @@ -8,12 +8,12 @@ /* */ /* This file is Copyright (C) 1993 by Russ Herman. */ /* REMIND is Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: os2func.c,v 1.3 1999-04-05 17:34:54 dfs Exp $"; +static char const RCSID[] = "$Id: os2func.c,v 1.4 2000-02-18 03:46:04 dfs Exp $"; #ifdef OS2_POPUP #define INCL_VIO diff --git a/src/protos.h b/src/protos.h index 45b11223..e90d93b8 100644 --- a/src/protos.h +++ b/src/protos.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: protos.h,v 1.7 1999-04-05 17:34:54 dfs Exp $ */ +/* $Id: protos.h,v 1.8 2000-02-18 03:46:05 dfs Exp $ */ #ifdef HAVE_PROTOS #define ARGS(x) x diff --git a/src/queue.c b/src/queue.c index 37057f4c..7f0413f3 100644 --- a/src/queue.c +++ b/src/queue.c @@ -6,17 +6,16 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: queue.c,v 1.14 2000-02-02 20:20:33 dfs Exp $"; +static char const RCSID[] = "$Id: queue.c,v 1.15 2000-02-18 03:46:06 dfs Exp $"; /* Solaris needs this to get select() prototype */ #ifdef __sun__ #define __EXTENSIONS__ 1 -#undef _POSIX_SOURCE #endif /* We only want object code generated if we have queued reminders */ @@ -31,6 +30,10 @@ static char const RCSID[] = "$Id: queue.c,v 1.14 2000-02-02 20:20:33 dfs Exp $"; #include #endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif + #ifdef HAVE_STDLIB_H #include #endif @@ -306,8 +309,13 @@ QueuedRem *q; r = CalculateNextTimeUsingSched(q); if (r != NO_TIME) return r; } - if (delta == NO_DELTA) - if (tim < curtime) return NO_TIME; else return tim; + if (delta == NO_DELTA) { + if (tim < curtime) { + return NO_TIME; + } else { + return tim; + } + } tim -= delta; if (rep == NO_REP) rep = delta; diff --git a/src/rem2ps.c b/src/rem2ps.c index c913a1e4..a0f50dd0 100644 --- a/src/rem2ps.c +++ b/src/rem2ps.c @@ -6,13 +6,13 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" #include "dynbuf.h" -static char const RCSID[] = "$Id: rem2ps.c,v 1.9 1999-04-05 17:34:55 dfs Exp $"; +static char const RCSID[] = "$Id: rem2ps.c,v 1.10 2000-02-18 03:46:07 dfs Exp $"; #include #include diff --git a/src/rem2ps.h b/src/rem2ps.h index bf09ecc0..e2cf30a1 100644 --- a/src/rem2ps.h +++ b/src/rem2ps.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: rem2ps.h,v 1.3 1999-04-05 17:34:56 dfs Exp $ */ +/* $Id: rem2ps.h,v 1.4 2000-02-18 03:46:08 dfs Exp $ */ char *PSProlog1[] = { diff --git a/src/sort.c b/src/sort.c index 22c0b327..945e02d0 100644 --- a/src/sort.c +++ b/src/sort.c @@ -6,12 +6,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: sort.c,v 1.5 1999-04-05 17:34:56 dfs Exp $"; +static char const RCSID[] = "$Id: sort.c,v 1.6 2000-02-18 03:46:09 dfs Exp $"; #include #include diff --git a/src/token.c b/src/token.c index 78497a04..d44832ee 100644 --- a/src/token.c +++ b/src/token.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: token.c,v 1.8 1999-04-05 17:34:57 dfs Exp $"; +static char const RCSID[] = "$Id: token.c,v 1.9 2000-02-18 03:46:10 dfs Exp $"; #include #include diff --git a/src/trigger.c b/src/trigger.c index fe9064b1..e5dfceea 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -6,12 +6,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: trigger.c,v 1.4 1999-04-05 17:34:57 dfs Exp $"; +static char const RCSID[] = "$Id: trigger.c,v 1.5 2000-02-18 03:46:11 dfs Exp $"; #include diff --git a/src/types.h b/src/types.h index 91ce805b..1212aedf 100644 --- a/src/types.h +++ b/src/types.h @@ -6,11 +6,11 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: types.h,v 1.4 1999-04-05 17:34:58 dfs Exp $ */ +/* $Id: types.h,v 1.5 2000-02-18 03:46:12 dfs Exp $ */ #include "dynbuf.h" diff --git a/src/userfns.c b/src/userfns.c index adfa72af..a07bcb19 100644 --- a/src/userfns.c +++ b/src/userfns.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: userfns.c,v 1.5 1999-04-05 17:34:59 dfs Exp $"; +static char const RCSID[] = "$Id: userfns.c,v 1.6 2000-02-18 03:46:13 dfs Exp $"; #include #include diff --git a/src/utils.c b/src/utils.c index 23b1847d..1614de8a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -6,12 +6,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: utils.c,v 1.4 1999-04-05 17:34:59 dfs Exp $"; +static char const RCSID[] = "$Id: utils.c,v 1.5 2000-02-18 03:46:14 dfs Exp $"; #include #include diff --git a/src/var.c b/src/var.c index 1c466e50..258a0bb5 100644 --- a/src/var.c +++ b/src/var.c @@ -7,12 +7,12 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ #include "config.h" -static char const RCSID[] = "$Id: var.c,v 1.6 1999-04-05 17:34:59 dfs Exp $"; +static char const RCSID[] = "$Id: var.c,v 1.7 2000-02-18 03:46:15 dfs Exp $"; #include #include diff --git a/src/version.h b/src/version.h index 83f4181e..d7482586 100644 --- a/src/version.h +++ b/src/version.h @@ -6,9 +6,9 @@ /* */ /* This file is part of REMIND. */ /* Copyright (C) 1992-1998 by David F. Skoll */ -/* Copyright (C) 1999 by Roaring Penguin Software Inc. */ +/* Copyright (C) 1999-2000 by Roaring Penguin Software Inc. */ /* */ /***************************************************************/ -/* $Id: version.h,v 1.8 1999-04-21 01:48:01 dfs Exp $ */ +/* $Id: version.h,v 1.9 2000-02-18 03:46:16 dfs Exp $ */ #define VERSION "03.00.21" diff --git a/tests/test-rem b/tests/test-rem index b636e9d5..b57e5013 100644 --- a/tests/test-rem +++ b/tests/test-rem @@ -2,15 +2,15 @@ # --------------------------------------------------------------------------- # TEST-REM # -# $Id: test-rem,v 1.3 1999-04-05 17:35:13 dfs Exp $ +# $Id: test-rem,v 1.4 2000-02-18 03:46:29 dfs Exp $ # # This file runs an acceptance test for Remind. To use it, type: # sh test-rem OR make test # in the build directory. # # This file is part of REMIND. -# Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1992-1997 David F. Skoll +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # --------------------------------------------------------------------------- TEST_GETENV="foo bar baz" ; export TEST_GETENV diff --git a/tests/test-rem.bat b/tests/test-rem.bat index 665c6b64..5a2d131c 100644 --- a/tests/test-rem.bat +++ b/tests/test-rem.bat @@ -2,15 +2,15 @@ rem --------------------------------------------------------------------------- rem TEST-REM rem -rem $Id: test-rem.bat,v 1.2 1999-04-05 17:35:14 dfs Exp $ +rem $Id: test-rem.bat,v 1.3 2000-02-18 03:46:31 dfs Exp $ rem rem This file runs an MSDOS acceptance test for Remind. To use it, type: rem test-rem rem in the build directory. rem rem This file is part of REMIND. -rem Copyright (C) 1992-1997 by David F. Skoll -rem Copyright (C) 1999 by Roaring Penguin Software Inc. +rem Copyright (C) 1992-1997 David F. Skoll +rem Copyright (C) 1999-2000 Roaring Penguin Software Inc. rem --------------------------------------------------------------------------- del test.out > nul diff --git a/tests/test-rem.cmd b/tests/test-rem.cmd index 67855939..c569c059 100644 --- a/tests/test-rem.cmd +++ b/tests/test-rem.cmd @@ -2,15 +2,15 @@ rem --------------------------------------------------------------------------- rem TEST-REM rem -rem $Id: test-rem.cmd,v 1.2 1999-04-05 17:35:14 dfs Exp $ +rem $Id: test-rem.cmd,v 1.3 2000-02-18 03:46:32 dfs Exp $ rem rem This file runs an OS/2 acceptance test for Remind. To use it, type: rem test-rem rem in the build directory. rem rem This file is part of REMIND. -rem Copyright (C) 1992-1997 by David F. Skoll -rem Copyright (C) 1999 by Roaring Penguin Software Inc. +rem Copyright (C) 1992-1997 David F. Skoll +rem Copyright (C) 1999-2000 Roaring Penguin Software Inc. rem --------------------------------------------------------------------------- del /f test.out > nul diff --git a/tests/tstlang.rem b/tests/tstlang.rem index 8454ce58..74460b3c 100644 --- a/tests/tstlang.rem +++ b/tests/tstlang.rem @@ -3,7 +3,7 @@ # # TSTLANG.REM # -# $Id: tstlang.rem,v 1.2 1999-04-05 17:35:14 dfs Exp $ +# $Id: tstlang.rem,v 1.3 2000-02-18 03:46:33 dfs Exp $ # # Use this file to test new language headers you may want to create. # Usage: remind -rq tstlang.rem @@ -13,8 +13,8 @@ # Use the output to verify your translations. # # This file is part of REMIND. -# Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1992-1997 David F. Skoll +# Copyright (C) 1999-2000 Roaring Penguin Software Inc. # # --------------------------------------------------------------------------- diff --git a/www/cal_dispatch-DIST b/www/cal_dispatch-DIST index a46028b4..4733c290 100755 --- a/www/cal_dispatch-DIST +++ b/www/cal_dispatch-DIST @@ -2,12 +2,12 @@ # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. # CAL_DISPATCH -- Shell script for CGI directory to dispatch calendar # commands. # -# $Id: cal_dispatch-DIST,v 1.4 1999-04-05 17:35:16 dfs Exp $ +# $Id: cal_dispatch-DIST,v 1.5 2000-02-18 03:46:34 dfs Exp $ # # WARNING WARNING WARNING -- If your /bin/sh is really GNU's "bash", # make sure you don't have a buggy version which treats char 0xFF as diff --git a/www/calps b/www/calps index fbcd4c7d..3f807b22 100755 --- a/www/calps +++ b/www/calps @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: calps,v 1.2 1999-04-05 17:35:17 dfs Exp $ +# $Id: calps,v 1.3 2000-02-18 03:46:35 dfs Exp $ echo "Content-type: application/postscript" echo diff --git a/www/hebdate b/www/hebdate index 05851da2..e32a86bf 100755 --- a/www/hebdate +++ b/www/hebdate @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: hebdate,v 1.3 1999-04-05 17:35:17 dfs Exp $ +# $Id: hebdate,v 1.4 2000-02-18 03:46:36 dfs Exp $ echo Content-type: text/html echo "" diff --git a/www/hebdate.rem-DIST b/www/hebdate.rem-DIST index 1bf0c3d0..e3f69180 100644 --- a/www/hebdate.rem-DIST +++ b/www/hebdate.rem-DIST @@ -2,9 +2,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: hebdate.rem-DIST,v 1.7 1999-10-18 20:08:55 dfs Exp $ +# $Id: hebdate.rem-DIST,v 1.8 2000-02-18 03:46:37 dfs Exp $ BANNER % IF !$PSCAL diff --git a/www/hebhtml b/www/hebhtml index 32826df8..7e1bd7d5 100755 --- a/www/hebhtml +++ b/www/hebhtml @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: hebhtml,v 1.3 1999-04-05 17:35:18 dfs Exp $ +# $Id: hebhtml,v 1.4 2000-02-18 03:46:38 dfs Exp $ echo "Content-Type: text/html" echo "" diff --git a/www/hebps b/www/hebps index a717c244..f2e94ec9 100755 --- a/www/hebps +++ b/www/hebps @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: hebps,v 1.4 1999-04-05 17:35:19 dfs Exp $ +# $Id: hebps,v 1.5 2000-02-18 03:46:39 dfs Exp $ # Figure out the month: If day <= 20, use this month; otherwise, use # next month. diff --git a/www/moon b/www/moon index d0972817..a115471f 100755 --- a/www/moon +++ b/www/moon @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: moon,v 1.2 1999-04-05 17:35:19 dfs Exp $ +# $Id: moon,v 1.3 2000-02-18 03:46:40 dfs Exp $ echo Content-type: text/html echo diff --git a/www/moon.rem-DIST b/www/moon.rem-DIST index 189cf783..59fa551c 100644 --- a/www/moon.rem-DIST +++ b/www/moon.rem-DIST @@ -2,9 +2,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: moon.rem-DIST,v 1.2 1999-04-05 17:35:20 dfs Exp $ +# $Id: moon.rem-DIST,v 1.3 2000-02-18 03:46:41 dfs Exp $ set now now() diff --git a/www/sunrise b/www/sunrise index 4677f7fc..c54aa95a 100755 --- a/www/sunrise +++ b/www/sunrise @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: sunrise,v 1.2 1999-04-05 17:35:20 dfs Exp $ +# $Id: sunrise,v 1.3 2000-02-18 03:46:42 dfs Exp $ echo Content-type: text/html echo diff --git a/www/sunrise.rem-DIST b/www/sunrise.rem-DIST index ccc9ae11..19fcc361 100755 --- a/www/sunrise.rem-DIST +++ b/www/sunrise.rem-DIST @@ -2,9 +2,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: sunrise.rem-DIST,v 1.2 1999-04-05 17:35:20 dfs Exp $ +# $Id: sunrise.rem-DIST,v 1.3 2000-02-18 03:46:43 dfs Exp $ set now now() diff --git a/www/sunset b/www/sunset index 254dd939..b9f06c5d 100755 --- a/www/sunset +++ b/www/sunset @@ -3,9 +3,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: sunset,v 1.2 1999-04-05 17:35:21 dfs Exp $ +# $Id: sunset,v 1.3 2000-02-18 03:46:44 dfs Exp $ echo Content-type: text/html echo diff --git a/www/sunset.rem-DIST b/www/sunset.rem-DIST index 914493f2..36589bd1 100644 --- a/www/sunset.rem-DIST +++ b/www/sunset.rem-DIST @@ -2,9 +2,9 @@ # # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# Copyright (C) 1999 by Roaring Penguin Software Inc. +# Copyright (C) 1999-2000 by Roaring Penguin Software Inc. -# $Id: sunset.rem-DIST,v 1.3 1999-04-05 17:35:21 dfs Exp $ +# $Id: sunset.rem-DIST,v 1.4 2000-02-18 03:46:45 dfs Exp $ set now now()