Changeset 2455Tweet

Timestamp:

Jun 19, 2008, 1:36:52 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Do not build grab.c conditionally; instead, make grab_process() and create_pty_grab() return an error if the feature isn't available.

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/grab.c (modified) (3 diffs)
• src/main.c (modified) (2 diffs)
• src/neercs.h (modified) (2 diffs)
• src/screens.c (modified) (2 diffs)
• src/term.c (modified) (2 diffs)

neercs/trunk/configure.ac

@@ -46 +46 @@
 esac 
 
-AM_CONDITIONAL(USE_GRAB, test "$grab" = "yes")
 if test "$grab" = "yes"; then
   AC_DEFINE(USE_GRAB, 1, [Grabbing processes is supported])

neercs/trunk/src/Makefile.am

@@ -2 +2 @@
 bin_PROGRAMS = neercs
 
-
-if USE_GRAB
-grab_c=grab.c
-endif
-
-neercs_SOURCES = neercs.h $(grab_c) mygetopt.c recurrent.c main.c screens.c term.c effects.c wm.c screensaver.c
+neercs_SOURCES = neercs.h mygetopt.c recurrent.c main.c screens.c term.c \
+                 grab.c effects.c wm.c screensaver.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@

neercs/trunk/src/grab.c

@@ -7 +7 @@
 #include <unistd.h>
 
-#include <sys/ioctl.h>
-#include <sys/ptrace.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-
-#include <linux/kdev_t.h>
-#include <linux/major.h>
+#if defined USE_GRAB
+#   include <sys/ioctl.h>
+#   include <sys/ptrace.h>
+#   include <sys/stat.h>
+#   include <sys/syscall.h>
+#   include <sys/user.h>
+#   include <sys/wait.h>
+
+#   include <linux/kdev_t.h>
+#   include <linux/major.h>
+#endif
 
 #include "neercs.h"
 
+#if defined USE_GRAB
 static int memcpy_from_target(pid_t pid, void* dest, void* src, size_t n)
 {
@@ -220 +223 @@
     return 0;
 }
+#endif
 
 int grab_process(pid_t pid, char *ptyname, int ptyfd)
 {
+#if defined USE_GRAB
     int i, fd = 0, mode, ret;
     char fdstr[1024];
@@ -288 +293 @@
 
     return 0;
-}
+#else
+    return -1;
+#endif
+}
+

neercs/trunk/src/main.c

@@ -139 +139 @@
         int option_index = 0;
         static struct myoption long_options[] =
-            {
-#ifdef USE_GRAB
-                { "pid",         1, NULL, 'P' },
+        {
+#if defined USE_GRAB
+            { "pid",         1, NULL, 'P' },
 #endif
-                { "help",        0, NULL, 'h' },
-                { "version",     0, NULL, 'v' },
-            };
+            { "help",        0, NULL, 'h' },
+            { "version",     0, NULL, 'v' },
+        };
+#if defined USE_GRAB
         int c = mygetopt(argc, argv, "P:hv", long_options, &option_index);
+#else
+        int c = mygetopt(argc, argv, "hv", long_options, &option_index);
+#endif
         if(c == -1)
             break;
@@ -152 +156 @@
         switch(c)
         {
-#ifdef USE_GRAB
         case 'P': /* --pid */
             add_screen(screen_list,create_screen_grab(w, h, atoi(myoptarg)));
             s+=2;
             break;
-#endif
         case 'h': /* --help */
             //   usage(argc, argv);

neercs/trunk/src/neercs.h

@@ -99 +99 @@
 
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
-#ifdef USE_GRAB
 int create_pty_grab(pid_t pid, unsigned int w, unsigned int h);
 int grab_process(pid_t pid, char *ptyname, int ptyfd);
-#endif
 
 long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size);
@@ -116 +114 @@
 /* Screens management */
 struct screen* create_screen(int w, int h, char *command);
-#ifdef USE_GRAB
 struct screen* create_screen_grab(int w, int h, int pid);
-#endif
 int destroy_screen(struct screen *s);
 int add_screen(struct screen_list *list, struct screen *s);

neercs/trunk/src/screens.c

@@ -30 +30 @@
 #include "neercs.h"
 
-#ifdef USE_GRAB
 struct screen* create_screen_grab(int w, int h, int pid)
 {
@@ -58 +57 @@
     return s;
 }
-#endif
 
 struct screen* create_screen(int w, int h, char *command)

neercs/trunk/src/term.c

@@ -578 +578 @@
 }
 
-#ifdef USE_GRAB
 int create_pty_grab(pid_t pid, unsigned int w, unsigned int h)
 {
@@ -597 +596 @@
     return fdm;
 }
-#endif
 
 int set_tty_size(int fd, unsigned int w, unsigned int h)