Commit fbfed6f0 authored by Jim Blandy's avatar Jim Blandy
Browse files

entered into RCS

parent 4d4c4e02
...@@ -17,7 +17,14 @@ ...@@ -17,7 +17,14 @@
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include "../src/config.h"
#ifdef USG
#include <string.h>
#else
#include <strings.h> #include <strings.h>
#endif
/* BSD's strings.h does not declare the type of strtok. */ /* BSD's strings.h does not declare the type of strtok. */
extern char *strtok (); extern char *strtok ();
......
/* /* timer.c --- daemon to provide a tagged interval timer service
* timer.c --- daemon to provide a tagged interval timer service
* This little daemon runs forever waiting for signals. SIGIO (or
* This little daemon runs forever waiting for signals. SIGIO (or SIGUSR1) SIGUSR1) causes it to read an event spec from stdin; that is, a
* causes it to read an event spec from stdin; that is, a date followed by date followed by colon followed by an event label. SIGALRM causes
* colon followed by an event label. SIGALRM causes it to check its queue it to check its queue for events attached to the current second; if
* for events attached to the current second; if one is found, its label one is found, its label is written to stdout. SIGTERM causes it to
* is written to stdout. SIGTERM causes it to terminate, printing a list terminate, printing a list of pending events.
* of pending events.
* This program is intended to be used with the lisp package called
* This program is intended to be used with the lisp package called timer.el. timer.el. It was written anonymously in 1990. This version was
* It was written anonymously in 1990. This version was documented and documented and rewritten for portability by esr@snark,thyrsus.com,
* rewritten for portability by esr@snark,thyrsus.com, Aug 7 1992. Aug 7 1992. */
*/
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <fcntl.h> /* FASYNC */ #include <fcntl.h> /* FASYNC */
...@@ -24,10 +24,8 @@ ...@@ -24,10 +24,8 @@
#endif #endif
extern int errno; extern int errno;
extern char *sys_errlist[], *malloc(); extern char *sys_errlist[], *malloc ();
extern time_t time(); extern time_t time ();
#define MAXEVENTS 256
/* /*
* The field separator for input. This character shouldn't be legal in a date, * The field separator for input. This character shouldn't be legal in a date,
...@@ -37,185 +35,235 @@ extern time_t time(); ...@@ -37,185 +35,235 @@ extern time_t time();
#define FS '@' #define FS '@'
struct event struct event
{ {
char *token; char *token;
time_t reply_at; time_t reply_at;
} };
events[MAXEVENTS]; int events_size; /* How many slots have we allocated? */
int num_events; /* How many are actually scheduled? */
struct event *events; /* events[0 .. num_events-1] are the
valid events. */
char *pname; /* programme name for error messages */ char *pname; /* programme name for error messages */
/* Accepts a string of two fields seperated by FS. /* Accepts a string of two fields seperated by FS.
* First field is string for getdate, saying when to wake-up. First field is string for getdate, saying when to wake-up.
* Second field is a token to identify the request. Second field is a token to identify the request. */
*/ void
void schedule(str) schedule (str)
char *str; char *str;
{ {
extern time_t getdate(); extern time_t getdate ();
extern char *strcpy(); extern char *strcpy ();
time_t now; time_t now;
register char *p; register char *p;
static struct event *ep; static struct event *ep;
#ifdef DEBUG /* check entry format */
(void) fprintf(stderr, "Timer sees: %s", str); for (p = str; *p && *p != FS; p++)
#endif /* DEBUG */ continue;
if (!*p)
/* check entry format */
for(p = str; *p && *p != FS; p++)
continue;
if (!*p)
{ {
(void)fprintf(stderr, "%s: bad input format: %s", pname, str); fprintf (stderr, "%s: bad input format: %s", pname, str);
return; return;
} }
*p++ = 0; *p++ = 0;
/* allocate an event slot */ /* allocate an event slot */
for(ep = events; ep < events + MAXEVENTS; ep++) ep = events + num_events;
if (ep->token == (char *)NULL)
break; /* If the event array is full, stretch it. After stretching, we know
if (ep == events + MAXEVENTS) that ep will be pointing to an available event spot. */
(void) fprintf(stderr, "%s: too many events: %s", pname, str); if (ep == events + events_size)
/* don't allow users to schedule events in past time */
else if ((ep->reply_at = get_date(str, NULL)) - time(&now) < 0)
(void)fprintf(stderr, "%s: bad time spec: %s%c%s", pname, str, FS, p);
/* save the event description */
else if ((ep->token = malloc((unsigned)strlen(p) + 1)) == NULL)
(void)fprintf(stderr, "%s: malloc %s: %s%c%s",
pname, sys_errlist[errno], str, FS, p);
else
{ {
(void)strcpy(ep->token, p); int old_size = events_size;
#ifdef DEBUG events_size *= 2;
(void) fprintf(stderr, events = ((struct event *)
"New event: %ld: %s", ep->reply_at, ep->token); realloc (events, events_size * sizeof (struct event)));
#endif /* DEBUG */ if (! events)
{
fprintf (stderr, "%s: virtual memory exhausted.\n", pname);
/* Should timer exit now? Well, we've still got other
events in the queue, and more memory might become
available in the future, so we'll just toss this event.
This will screw up whoever scheduled the event, but
maybe someone else will survive. */
return;
}
while (old_size < events_size)
events[old_size++].token = NULL;
}
/* Don't allow users to schedule events in past time. */
ep->reply_at = get_date (str, NULL);
if (ep->reply_at - time (&now) < 0)
{
fprintf (stderr, "%s: bad time spec: %s%c%s", pname, str, FS, p);
return;
}
/* save the event description */
ep->token = (char *) malloc ((unsigned) strlen (p) + 1);
if (! ep->token)
{
fprintf (stderr, "%s: malloc %s: %s%c%s",
pname, sys_errlist[errno], str, FS, p);
return;
} }
strcpy (ep->token, p);
num_events++;
} }
void void
notify() notify ()
{ {
time_t now, tdiff, waitfor = -1; time_t now, tdiff, waitfor;
register struct event *ep; register struct event *ep;
now = time ((time_t *) NULL);
now = time((time_t *)NULL); for (ep = events; ep < events + num_events; ep++)
/* Are any events ready to fire? */
if (ep->reply_at <= now)
{
fputs (ep->token, stdout);
free (ep->token);
for(ep = events; ep < events + MAXEVENTS; ep++) /* We now have a hole in the event array; fill it with the last
if (ep->token) event. */
ep->token = events[num_events].token;
ep->reply_at = events[num_events].reply_at;
num_events--;
/* We ought to scan this event again. */
ep--;
}
else
{
/* next timeout should be the soonest of any remaining */
if ((tdiff = ep->reply_at - now) < waitfor || waitfor < 0)
waitfor = (long)tdiff;
}
/* If there are no more events, we needn't bother setting an alarm. */
if (num_events > 0)
alarm (waitfor);
}
void
getevent ()
{
int i;
char *buf;
int buf_size;
/* In principle the itimer should be disabled on entry to this
function, but it really doesn't make any important difference
if it isn't. */
buf_size = 80;
buf = (char *) malloc (buf_size);
/* Read a line from standard input, expanding buf if it is too short
to hold the line. */
for (i = 0; ; i++)
{
int c;
if (i >= buf_size)
{ {
/* any events ready to fire? */ buf_size *= 2;
if (ep->reply_at <= now) buf = (char *) realloc (buf, buf_size);
{
#ifdef DEBUG /* If we're out of memory, toss this event. */
(void) fprintf(stderr, do
"Event %d firing: %ld @ %s",
(ep - events), ep->reply_at, ep->token);
#endif /* DEBUG */
(void)fputs(ep->token, stdout);
free(ep->token);
ep->token = (char *)NULL;
}
else
{ {
#ifdef DEBUG c = getchar ();
(void) fprintf(stderr,
"Event %d still waiting: %ld @ %s",
(ep - events), ep->reply_at, ep->token);
#endif /* DEBUG */
/* next timeout should be the soonest of any remaining */
if ((tdiff = ep->reply_at - now) < waitfor || waitfor < 0)
waitfor = (long)tdiff;
} }
while (c != '\n' && c != EOF);
return;
} }
/* If there's no more events, SIGIO should be next wake-up */ c = getchar ();
if (waitfor != -1)
{
#ifdef DEBUG
(void) fprintf(stderr,
"Setting %d-second alarm\n", waitfor);
#endif /* DEBUG */
(void)alarm(waitfor);
}
}
void if (c == EOF)
getevent() exit (0);
{
extern char *fgets();
struct event *ep;
char buf[BUFSIZ];
/* in principle the itimer should be disabled on entry to this function, if (c == '\n')
but it really doesn't make any important difference if it isn't */ {
buf[i] = '\0';
break;
}
if (fgets(buf, sizeof(buf), stdin) == NULL) buf[i] = c;
exit(0); }
/* register the event */ /* Register the event. */
schedule(buf); schedule (buf);
free (buf);
/* Who knows what this interrupted, or if it said "now"? */ /* Who knows what this interrupted, or if it said "now"? */
notify(); notify ();
} }
void void
sigcatch(sig) sigcatch (sig)
int sig;
/* dispatch on incoming signal, then restore it */ /* dispatch on incoming signal, then restore it */
{ {
struct event *ep; struct event *ep;
switch(sig) switch (sig)
{ {
case SIGALRM: case SIGALRM:
#ifdef DEBUG notify ();
(void) fprintf(stderr, "Alarm signal received\n"); break;
#endif /* DEBUG */
notify();
break;
case SIGIO: case SIGIO:
getevent(); getevent ();
break; break;
case SIGTERM: case SIGTERM:
(void) fprintf(stderr, "Events still queued:\n"); fprintf (stderr, "Events still queued:\n");
for (ep = events; ep < events + MAXEVENTS; ep++) for (ep = events; ep < events + num_events; ep++)
if (ep->token) fprintf (stderr, "%d = %ld @ %s",
(void) fprintf(stderr, "%d = %ld @ %s", ep - events, ep->reply_at, ep->token);
ep - events, ep->reply_at, ep->token); exit (0);
exit(0); break;
break;
} }
/* required on older UNIXes; harmless on newer ones */ /* required on older UNIXes; harmless on newer ones */
(void) signal(sig, sigcatch); signal (sig, sigcatch);
} }
/*ARGSUSED*/ /*ARGSUSED*/
int int
main(argc, argv) main (argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
for (pname = argv[0] + strlen(argv[0]); *pname != '/' && pname != argv[0]; for (pname = argv[0] + strlen (argv[0]);
*pname != '/' && pname != argv[0];
pname--); pname--);
if (*pname == '/') pname++; if (*pname == '/')
pname++;
events_size = 16;
events = ((struct event *) malloc (events_size * sizeof (*events)));
num_events = 0;
(void)signal(SIGIO, sigcatch); signal (SIGIO, sigcatch);
(void)signal(SIGALRM, sigcatch); signal (SIGALRM, sigcatch);
(void)signal(SIGTERM, sigcatch); signal (SIGTERM, sigcatch);
#ifndef USG #ifndef USG
(void)fcntl(0, F_SETFL, FASYNC); fcntl (0, F_SETFL, FASYNC);
#endif /* USG */ #endif /* USG */
while (1) pause(); while (1) pause ();
} }
/* timer.c ends here */ /* timer.c ends here */
...@@ -328,40 +328,40 @@ latitude, time zone, and date. ...@@ -328,40 +328,40 @@ latitude, time zone, and date.
This function is suitable for execution in a .emacs file." This function is suitable for execution in a .emacs file."
(interactive "p") (interactive "p")
(if (< arg 16) (if (and (< arg 16)
(if (not (and calendar-latitude calendar-longitude calendar-time-zone)) (not (and calendar-latitude calendar-longitude calendar-time-zone)))
(solar-setup))) (solar-setup))
(let* ((calendar-longitude (let* ((calendar-longitude
(if (< arg 16) (if (< arg 16) calendar-longitude
calendar-longitude
(solar-get-number (solar-get-number
"Enter longitude (decimal fraction; + east, - west): "))) "Enter longitude (decimal fraction; + east, - west): ")))
(calendar-latitude (calendar-latitude
(if (< arg 16) (if (< arg 16) calendar-latitude
calendar-latitude
(solar-get-number (solar-get-number
"Enter latitude (decimal fraction; + north, - south): "))) "Enter latitude (decimal fraction; + north, - south): ")))
(calendar-time-zone (calendar-time-zone
(if (< arg 16) (if (< arg 16) calendar-time-zone
calendar-time-zone
(solar-get-number (solar-get-number
"Enter difference from Universal Time (in minutes): "))) "Enter difference from Universal Time (in minutes): ")))
(calendar-location-name (calendar-location-name
(let ((float-output-format "%.1f")) (if (< arg 16) calendar-location-name
(format "%s%s, %s%s" (let ((float-output-format "%.1f"))
(abs calendar-latitude) (format "%s%s, %s%s"
(if (> calendar-latitude 0) "N" "S") (abs calendar-latitude)
(abs calendar-longitude) (if (> calendar-latitude 0) "N" "S")
(if (> calendar-longitude 0) "E" "W")))) (abs calendar-longitude)
(if (> calendar-longitude 0) "E" "W")))))
(calendar-standard-time-zone-name (calendar-standard-time-zone-name
(cond ((= calendar-time-zone 0) "UT") (if (< arg 16) calendar-standard-time-zone-name
((< calendar-time-zone 0) (format "UT%dmin" calendar-time-zone)) (cond ((= calendar-time-zone 0) "UT")
(t (format "UT+%dmin" calendar-time-zone)))) ((< calendar-time-zone 0)
(calendar-daylight-savings-starts nil) (format "UT%dmin" calendar-time-zone))
(calendar-daylight-savings-ends nil) (t (format "UT+%dmin" calendar-time-zone)))))
(date (if (< arg 4) (calendar-daylight-savings-starts
(calendar-current-date) (if (< arg 16) calendar-daylight-savings-starts))
(calendar-read-date))) (calendar-daylight-savings-ends
(if (< arg 16) calendar-daylight-savings-ends))
(date (if (< arg 4) (calendar-current-date) (calendar-read-date)))
(date-string (calendar-date-string date t)) (date-string (calendar-date-string date t))
(time-string (solar-sunrise-sunset date)) (time-string (solar-sunrise-sunset date))
(msg (format "%s: %s" date-string time-string)) (msg (format "%s: %s" date-string time-string))
......
...@@ -179,7 +179,7 @@ to read a file name from the minibuffer." ...@@ -179,7 +179,7 @@ to read a file name from the minibuffer."
(insert-buffer-substring buf) (insert-buffer-substring buf)
(set-marker Info-tag-table-marker (set-marker Info-tag-table-marker
(match-end 0)))) (match-end 0))))
(set-marker Info-tag-table-marker pos)))) (set-marker Info-tag-table-marker pos))))
(setq Info-current-file (setq Info-current-file
(file-name-sans-versions buffer-file-name)))) (file-name-sans-versions buffer-file-name))))
(if (equal nodename "*") (if (equal nodename "*")
......
...@@ -198,6 +198,7 @@ before `hide-ifdef-mode' modifies it.") ...@@ -198,6 +198,7 @@ before `hide-ifdef-mode' modifies it.")
(cons '(hide-ifdef-mode " Ifdef") (cons '(hide-ifdef-mode " Ifdef")
minor-mode-alist))) minor-mode-alist)))
;;;###autoload
(defun hide-ifdef-mode (arg) (defun hide-ifdef-mode (arg)
"Toggle Hide-Ifdef mode. This is a minor mode, albeit a large one. "Toggle Hide-Ifdef mode. This is a minor mode, albeit a large one.
With ARG, turn Hide-Ifdef mode on iff arg is positive. With ARG, turn Hide-Ifdef mode on iff arg is positive.
...@@ -845,6 +846,7 @@ to redo on a recursive entry." ...@@ -845,6 +846,7 @@ to redo on a recursive entry."
;===%%SF%% exports (Start) === ;===%%SF%% exports (Start) ===
;;;###autoload
(defvar hide-ifdef-initially nil (defvar hide-ifdef-initially nil
"*Non-nil if `hide-ifdefs' should be called when Hide-Ifdef mode "*Non-nil if `hide-ifdefs' should be called when Hide-Ifdef mode
is first activated.") is first activated.")
...@@ -852,12 +854,14 @@ is first activated.") ...@@ -852,12 +854,14 @@ is first activated.")
(defvar hide-ifdef-hiding nil (defvar hide-ifdef-hiding nil
"Non-nil if text might be hidden.") "Non-nil if text might be hidden.")
;;;###autoload
(defvar hide-ifdef-read-only nil (defvar hide-ifdef-read-only nil
"*Set to non-nil if you want buffer to be read-only while hiding text.") "*Set to non-nil if you want buffer to be read-only while hiding text.")
(defvar hif-outside-read-only nil (defvar hif-outside-read-only nil
"Internal variable. Saves the value of `buffer-read-only' while hiding.") "Internal variable. Saves the value of `buffer-read-only' while hiding.")
;;;###autoload
(defvar hide-ifdef-lines nil (defvar hide-ifdef-lines nil
"*Set to t if you don't want to see the #ifX, #else, and #endif lines.") "*Set to t if you don't want to see the #ifX, #else, and #endif lines.")
......
...@@ -29,9 +29,10 @@ ...@@ -29,9 +29,10 @@
Arguments are REVERSE NEXTRECFUN ENDRECFUN &optional STARTKEYFUN ENDKEYFUN. Arguments are REVERSE NEXTRECFUN ENDRECFUN &optional STARTKEYFUN ENDKEYFUN.
We divide the accessible portion of the buffer into disjoint pieces We divide the accessible portion of the buffer into disjoint pieces
called sort records. A portion of each sort record (perhaps all of it) called sort records. A portion of each sort record (perhaps all of
is designated as the sort key. The records are rearranged in the buffer it) is designated as the sort key. The records are rearranged in the
in order by their sort keys. The records may or may not be contiguous. buffer in order by their sort keys. The records may or may not be
contiguous.
Usually the records are rearranged in order of ascending sort key. Usually the records are rearranged in order of ascending sort key.
If REVERSE is non-nil, they are rearranged in order of descending sort key. If REVERSE is non-nil, they are rearranged in order of descending sort key.
...@@ -78,19 +79,19 @@ same as ENDRECFUN." ...@@ -78,19 +79,19 @@ same as ENDRECFUN."
'buffer-substring-lessp) 'buffer-substring-lessp)
(t (t
'string<))) 'string<)))
(sort sort-lists (sort sort-lists
(cond ((numberp (car (car sort-lists))) (cond ((numberp (car (car sort-lists)))