[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [multitail] released development release 5.1.0 of MultiTail



>>>>> Folkert van Heusden writes:

    > released development release 5.1.0 of MultiTail

Hi Folkert

Attached a small patch against the latest version for cygwin. Inline a
log of the latest cygwin build:

gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o utils.o utils.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o mt.o mt.c
mt.c: In function `recv_from_fd':
mt.c:3177: warning: passing arg 1 of `gethostbyaddr' from incompatible pointer type
mt.c:3180: warning: assignment discards qualifiers from pointer target type
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o error.o error.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o my_pty.o my_pty.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o term.o term.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o scrollback.o scrollback.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o help.o help.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o mem.o mem.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o cv.o cv.c
cv.c: In function `do_convert':
cv.c:117: warning: passing arg 1 of `mystrdup' discards qualifiers from pointer target type
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o selbox.o selbox.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o stripstring.o stripstring.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o color.o color.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o misc.o misc.c
misc.c: In function `info':
misc.c:78: warning: unused variable `v1'
misc.c:78: warning: unused variable `v2'
misc.c:78: warning: unused variable `v3'
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o ui.o ui.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o exec.o exec.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o diff.o diff.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o config.o config.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o cmdline.o cmdline.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o globals.o globals.c
gcc -D__CYGWIN__ -O2 -Wall -DVERSION=\"5.1.0\"  -DCONFIG_FILE=\"/etc/multitail.conf\"   -c -o history.o history.c
gcc -Wall -W 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 -lpanel -lncurses -lm  -o multitail
Info: resolving _stdscr by linking to __imp__stdscr (auto-import)
Info: resolving _LINES by linking to __imp__LINES (auto-import)
Info: resolving _COLS by linking to __imp__COLS (auto-import)
Info: resolving _COLORS by linking to __imp__COLORS (auto-import)
Info: resolving _COLOR_PAIRS by linking to __imp__COLOR_PAIRS (auto-import)

Ciao
  Volker

diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/multitail-5.1.0/makefile.cygwin src/multitail-5.1.0/makefile.cygwin
--- origsrc/multitail-5.1.0/makefile.cygwin	2007-06-08 18:48:15.000000000 +0200
+++ src/multitail-5.1.0/makefile.cygwin	2007-06-09 17:10:13.964929600 +0200
@@ -14,13 +14,15 @@
 	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
 
 install: multitail
+	mkdir -p $(DESTDIR)/usr/bin
+	mkdir -p $(DESTDIR)/usr/share/man/man1
 	cp multitail $(DESTDIR)/usr/bin
 	cp multitail.1 $(DESTDIR)/usr/share/man/man1/multitail.1
 	#
 	### COPIED multitail.conf.new, YOU NEED TO REPLACE THE multitail.conf
 	### YOURSELF WITH THE NEW FILE
 	#
-	cp multitail.conf $(DESTDIR)/etc/multitail.conf.new
+	mkdir -p $(DESTDIR)/etc	
 	mkdir -p $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
 	cp *.txt INSTALL manual*.html $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
 	cp multitail.conf $(DESTDIR)/etc
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/multitail-5.1.0/misc.c src/multitail-5.1.0/misc.c
--- origsrc/multitail-5.1.0/misc.c	2007-06-08 18:48:15.000000000 +0200
+++ src/multitail-5.1.0/misc.c	2007-06-09 17:10:23.759012800 +0200
@@ -71,14 +71,16 @@
 
 	escape_print(mywin, 16, 2, "_Press any key to exit this screen_");
 
-#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__)
+#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__) || defined(__CYGWIN__)
 	for(;;)
 	{
 		dtime_t run_time = get_ts() - mt_started;
 		double v1, v2, v3;
 
+#ifndef __CYGWIN__
 		get_load_values(&v1, &v2, &v3);
 		mvwprintw(mywin -> win, 6, 2, "Current load of system: %f %f %f", v1, v2, v3);
+#endif
 
 		if (run_time)
 		{