ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...

[xscreensaver] / driver / xscreensaver-command.c

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index 9b86557b85f4ca541910d14e7001f37591380e26..a267f4e7538659fec2a1cc15a984f342bbd2a296 100644 (file)
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -1,5 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-2001
- *  by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2004 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -16,6 +15,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -48,11 +48,16 @@ static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
 static Atom XA_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE;
 
 static char *screensaver_version;
+# ifdef __GNUC__
+  __extension__   /* don't warn about "string length is greater than the
+                     length ISO C89 compilers are required to support" in the
+                     usage string... */
+# endif
 static char *usage = "\n\
 usage: %s -<option>\n\
 \n\
   This program provides external control of a running xscreensaver process.\n\
-  Version %s, copyright (c) 1991-2001 Jamie Zawinski <jwz@jwz.org>.\n\
+  Version %s, copyright (c) 1991-2003 Jamie Zawinski <jwz@jwz.org>.\n\
 \n\
   The xscreensaver program is a daemon that runs in the background.\n\
   You control a running xscreensaver process by sending it messages\n\
@@ -337,28 +342,29 @@ watch (Display *dpy)
          Atom type;
          int format;
          unsigned long nitems, bytesafter;
-         CARD32 *data = 0;
+          unsigned char *dataP = 0;
 
          if (XGetWindowProperty (dpy,
                                   RootWindow (dpy, 0),  /* always screen #0 */
                                  XA_SCREENSAVER_STATUS,
                                  0, 999, False, XA_INTEGER,
                                  &type, &format, &nitems, &bytesafter,
-                                 (unsigned char **) &data)
+                                 &dataP)
              == Success
              && type
-             && data)
+             && dataP)
            {
               time_t tt;
               char *s;
               Bool changed = False;
               Bool running = False;
+              CARD32 *data = (CARD32 *) dataP;
 
               if (type != XA_INTEGER || nitems < 3)
                 {
                 STATUS_LOSE:
-                  if (last) free (last);
-                  if (data) free (data);
+                  if (last) XFree (last);
+                  if (data) XFree (data);
                   fprintf (stderr, "%s: bad status format on root window.\n",
                            progname);
                   return -1;
@@ -402,7 +408,7 @@ watch (Display *dpy)
               if (running && changed)
                 {
                   int i;
-                  fprintf (stdout, "RUN", s);
+                  fprintf (stdout, "RUN");
                   for (i = 2; i < nitems; i++)
                     fprintf (stdout, " %d", (int) data[i]);
                   fprintf (stdout, "\n");
@@ -410,13 +416,13 @@ watch (Display *dpy)
 
               fflush (stdout);
 
-              if (last) free (last);
+              if (last) XFree (last);
               last = data;
            }
          else
            {
-             if (last) free (last);
-             if (data) free (data);
+             if (last) XFree (last);
+             if (dataP) XFree (dataP);
              fprintf (stderr, "%s: no saver status on root window.\n",
                       progname);
              return -1;