wok view multitail/stuff/tail_busybox.patch @ rev 5021
Up: libgphoto2, gphoto2 (fix security and bugs)
| author | Rohit Joshi <jozee@slitaz.org> |
|---|---|
| date | Mon Mar 01 16:54:24 2010 +0000 (2010-03-01) |
| parents | |
| children |
line source
1 --- multitail-5.2.2.ori/Makefile Mon May 19 11:19:09 2008
2 +++ multitail-5.2.2/Makefile Wed May 6 15:37:03 2009
3 @@ -6,7 +6,7 @@
4 DEBUG=-g # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs
5 LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
6 # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
7 -CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
8 +CFLAGS+=-funsigned-char -D`uname` -D__Busybox__ -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
10 OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
12 --- multitail-5.2.2.ori/exec.c Mon May 19 11:19:09 2008
13 +++ multitail-5.2.2/exec.c Wed May 6 15:34:59 2009
14 @@ -77,13 +77,15 @@
15 posix_version = getenv("_POSIX2_VERSION");
17 /* follow filename is only supported on *BSD and Linux */
18 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__GNU__)
19 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(linux) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__GNU__) || defined(__Busybox__)
20 if (follow_filename)
21 {
22 -#if defined(linux) || defined(__CYGWIN__) || defined(__GNU__)
23 +#if !defined(__Busybox__) && (defined(linux) || defined(__CYGWIN__) || defined(__GNU__))
24 pars[npars++] = "--follow=name";
25 #elif defined(__OpenBSD__)
26 pars[npars++] = "-f";
27 +#elif defined(__Busybox__)
28 + pars[npars++] = "-f";
29 #else
30 pars[npars++] = "-F";
31 #endif
32 @@ -95,7 +97,7 @@
33 else
34 #endif
35 {
36 -#if !defined(linux) && !defined(__CYGWIN__) && !defined(__GNU__)
37 +#if !defined(linux) && !defined(__CYGWIN__) && !defined(__GNU__) && !defined(__Busybox__)
38 if (follow_filename && gnu_tail)
39 pars[npars++] = "--follow=name";
40 #endif