less -> more

[unix-history] / usr / src / usr.bin / calendar / calendar.sh

diff --git a/usr/src/usr.bin/calendar/calendar.sh b/usr/src/usr.bin/calendar/calendar.sh
index c2c21b6..700cd6f 100644 (file)
--- a/usr/src/usr.bin/calendar/calendar.sh
+++ b/usr/src/usr.bin/calendar/calendar.sh
@@ -1,20 +1,45 @@
-: calendar.sh 4.1 81/02/28
-PATH=/bin:/usr/bin
-tmp=/tmp/cal$$
-trap "rm $tmp; exit" 0 1 2 13 15
-/usr/lib/calendar >$tmp
-case $# in
-0)
-       egrep -f $tmp calendar;;
-*)
+#!/bin/sh -
+#
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.  The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+#      @(#)calendar.sh 4.7 (Berkeley) %G%
+#
+PATH=/usr/lib:/bin:/usr/bin:/usr/ucb:/lib      # order important
+
+tmp=/tmp/cal0$$
+trap "rm -f $tmp /tmp/cal1$$ /tmp/cal2$$"
+trap exit 1 2 13 15
+calendar >$tmp
+
+if [ $# = 0 ]; then
+       trap "rm -f $tmp ; exit" 0 1 2 13 15
+       (cpp calendar | egrep -f $tmp)
+       exit 0
+fi
+
+if [ $# = 1 ] && [ $1 = "-" ]; then
+       trap "rm -f $tmp /tmp/cal1$$ /tmp/cal2$$; exit" 0 1 2 13 15
+       echo -n "Subject: Calendar for " > /tmp/cal1$$
+       date | sed -e "s/ [0-9]*:.*//" >> /tmp/cal1$$

        sed '
                s/\([^:]*\):.*:\(.*\):[^:]*$/y=\2 z=\1/
        ' /etc/passwd \
        | while read x
        do
                eval $x
        sed '
                s/\([^:]*\):.*:\(.*\):[^:]*$/y=\2 z=\1/
        ' /etc/passwd \
        | while read x
        do
                eval $x

-               if test -r $y/calendar; then
-                       egrep -f $tmp $y/calendar 2>/dev/null  | mail $z
+               if test -r $y/calendar
+               then
+                       (cpp $y/calendar | egrep -f $tmp) 2>/dev/null > /tmp/cal2$$
+                       if test -s /tmp/cal2$$
+                       then
+                               cat /tmp/cal1$$ /tmp/cal2$$ | mail $z
+                       fi

                fi
        done
                fi
        done

-esac
+       exit 0
+fi
+
+echo "usage: calendar [-]"
+exit 1