Update to 1.2

PR:		ports/70844
Submitted by:	Roman Bogorodskiy
Approved by:	maintainer timeout
This commit is contained in:
Volker Stolz 2004-11-23 11:12:03 +00:00
parent a5fd5af704
commit 6e5ba11233
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=122215
4 changed files with 32 additions and 67 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= roottail
PORTVERSION= 1.1
PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= http://www.goof.com/pcg/marc/data/
DISTNAME= root-tail-${PORTVERSION}

View file

@ -1,2 +1,2 @@
MD5 (root-tail-1.1.tar.gz) = adb925c2781892bb5dcbdf9d5e579032
SIZE (root-tail-1.1.tar.gz) = 20124
MD5 (root-tail-1.2.tar.gz) = 5a4b3c4c7ab3bed1f4575e9688aac5de
SIZE (root-tail-1.2.tar.gz) = 20805

View file

@ -1,64 +0,0 @@
--- root-tail.c.orig Thu Apr 8 21:58:28 2004
+++ root-tail.c Wed Jun 23 14:06:13 2004
@@ -152,6 +152,7 @@
void list_files (int);
void force_reopen (int);
void force_refresh (int);
+void exit_now (int);
void blank_window (int);
void InitWindow (void);
@@ -198,6 +199,13 @@
}
void
+exit_now (int signal)
+{
+ fprintf (stderr, "Program exiting due to signal: %d\n", signal);
+ exit(-1);
+}
+
+void
blank_window (int dummy)
{
XClearArea (disp, root, win_x, win_y, width + MARGIN_OF_ERROR, height, False);
@@ -655,11 +663,12 @@
char *
concat_line (char *p1, const char *p2)
{
+ int l1,l2;
+ char *r;
assert(p2);
- int l1 = p1 ? strlen (p1) : 0;
- int l2 = strlen (p2);
- char *r;
+ l1 = p1 ? strlen (p1) : 0;
+ l2 = strlen (p2);
if (p1)
r = xrealloc(p1, l1 + l2 + 1);
@@ -925,6 +934,7 @@
int wrapped = 0;
char *break_p = NULL;
int width_at_break_p = 0;
+ int prefix_len;
spaces = 0;
if (opt_justify)
@@ -992,7 +1002,6 @@
if (!wrapped)
break;
- int prefix_len;
/* choose where to break the line */
if (opt_wordwrap && break_p && break_p != beg)
@@ -1501,6 +1510,7 @@
install_signal (SIGHUP, force_reopen);
install_signal (SIGUSR1, list_files);
install_signal (SIGUSR2, force_refresh);
+ install_signal (SIGSEGV, exit_now);
if (opt_daemonize)
daemonize ();

View file

@ -0,0 +1,29 @@
--- root-tail.c.orig Fri Nov 19 20:56:03 2004
+++ root-tail.c Sat Nov 20 18:52:34 2004
@@ -233,17 +233,18 @@
{
if (!root)
{
+ Window unused;
+ Window *windows;
+ unsigned int count;
+
+ Atom type;
+ int format;
+ unsigned long nitems, bytes_after_return;
+ unsigned char *virtual_root_window;
+
Atom SWM_VROOT = XInternAtom (display, "__SWM_VROOT", False);
Atom NAUTILUS_DESKTOP_WINDOW_ID = XInternAtom (display, "NAUTILUS_DESKTOP_WINDOW_ID", False);
root = RootWindow (display, screen_number);
-
- Window unused, *windows = 0;
- unsigned int count;
-
- Atom type;
- int format;
- unsigned long nitems, bytes_after_return;
- unsigned char *virtual_root_window;
if (XGetWindowProperty (display, root, NAUTILUS_DESKTOP_WINDOW_ID,
0, 1, False, XA_WINDOW, &type, &format,