|
[-]
[+]
|
Changed |
multitail.spec
|
|
|
|
|
Renamed |
multitail-5.2.9.diff
^
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/Makefile
^
|
| @@ -27,7 +27,7 @@
### COPIED multitail.conf.new, YOU NEED TO REPLACE THE multitail.conf
### YOURSELF WITH THE NEW FILE
#
- cp multitail.conf $(DESTDIR)/etc/multitail.conf.new
+ cp multitail.conf $(CONFIG_FILE).new
mkdir -p $(DESTDIR)/etc/multitail/
cp convert-* colors-* $(DESTDIR)/etc/multitail/
rm -f $(DESTDIR)/usr/share/man/man1/multitail.1.gz
@@ -46,7 +46,7 @@
uninstall: clean
rm -f $(DESTDIR)/usr/bin/multitail
rm -f $(DESTDIR)/usr/share/man/man1/multitail.1.gz
- rm -f $(DESTDIR)/etc/multitail.conf
+ rm -f $(CONFIG_FILE)
rm -rf $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
clean:
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/help.c
^
|
| @@ -104,7 +104,7 @@
char *help_list_keybindings[] = {
"This screen lists the keybindings you defined in",
"the MultiTail configurationfile which is located",
- "in /etc/multitail.conf. The keybindings only",
+ "in "CONFIG_FILE". The keybindings only",
"work in the main screen.",
"In this screen, you can press the followking",
"keys:",
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/mt.c
^
|
| @@ -1161,6 +1161,38 @@
}
}
+void delete_all_markerlines(void)
+{
+ int index;
+
+ for(index=0; index<nfd; index++)
+ {
+ int loop, ndeleted = 0;
+ buffer cur_lb;
+
+ memset(&cur_lb, 0x00, sizeof(buffer));
+
+ for(loop=0; loop<lb[index].curpos; loop++)
+ {
+ if ((lb[index].be)[loop].Bline == NULL)
+ {
+ ndeleted++;
+ continue;
+ }
+
+ cur_lb.be = myrealloc(cur_lb.be, (cur_lb.curpos + 1) * sizeof(buffered_entry), __FILE__, __PRETTY_FUNCTION__, __LINE__);
+ cur_lb.be[cur_lb.curpos].Bline = (lb[index].be)[loop].Bline;
+ cur_lb.be[cur_lb.curpos].pi = (lb[index].be)[loop].pi;
+ cur_lb.be[cur_lb.curpos].ts = (lb[index].be)[loop].ts;
+ cur_lb.curpos++;
+ }
+
+ delete_be_in_buffer(&lb[index]);
+ lb[index].be = cur_lb.be;
+ lb[index].curpos -= ndeleted;
+ }
+}
+
int add_marker_if_changed(int f_index, proginfo *cur)
{
int changed = 0;
@@ -2328,7 +2360,7 @@
printf("Could not determine size of file '%s' (which is supposed to be ", mail_spool_file);
printf("your mailfile): mail-check is disabled.\n");
printf("You can prevent this message by adding the line 'check_mail:0' ");
- printf("in /etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
+ printf("in "CONFIG_FILE" or in .multitailrc in your home-directory.\n\n");
printf("Press enter to continue...");
fflush(NULL);
getchar();
@@ -2371,6 +2403,12 @@
{
break;
}
+ else if (c == 'Z') /* clear all marker lines */
+ {
+ delete_all_markerlines();
+ do_refresh = 2;
+ continue;
+ }
else if (uc == 'A')
{
if (add_window())
@@ -3371,20 +3409,6 @@
if (max_wait != 0.0 && (get_ts() - max_wait_start) >= max_wait)
break;
- /* see if any processes have died (processes started
- * by matchin regular expressions)
- */
- if (need_died_procs_check)
- {
- need_died_procs_check = 0;
-
- if (check_for_died_processes())
- {
- c = -1;
- break;
- }
- }
-
if (got_sigusr1)
{
got_sigusr1 = 0;
@@ -3514,6 +3538,20 @@
}
}
+ /* see if any processes have died (processes started
+ * by matchin regular expressions)
+ */
+ if (need_died_procs_check)
+ {
+ need_died_procs_check = 0;
+
+ if (check_for_died_processes())
+ {
+ c = -1;
+ break;
+ }
+ }
+
closed_window:
/* any window changed? then we may want to update the terminal window header */
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/scrollback.c
^
|
| @@ -233,7 +233,7 @@
cur_lb.be = myrealloc(cur_lb.be, (cur_lb.curpos + 1) * sizeof(buffered_entry), __FILE__, __PRETTY_FUNCTION__, __LINE__);
cur_lb.be[cur_lb.curpos].pi = (pbuf -> be)[loop].pi;
- if ((pbuf -> be)[loop].pi != NULL && (pbuf -> be)[loop].pi -> cdef.term_emul != TERM_IGNORE)
+ if ((pbuf -> be)[loop].pi != NULL && (!IS_MARKERLINE((pbuf -> be)[loop].pi)) && (pbuf -> be)[loop].pi -> cdef.term_emul != TERM_IGNORE)
{
color_offset_in_line *cmatches;
int n_cmatches;
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/term.c
^
|
| @@ -432,7 +432,7 @@
dummy[min(strlen(dummy), line_width)] = 0x00;
for(loop=strlen(dummy); loop<line_width; loop++)
mvwprintw(win -> win, win_y, win_x + loop, " ");
- mvwprintw(win -> win, win_y, win_x, dummy);
+ mvwprintw(win -> win, win_y, win_x, "%s", dummy);
myfree(dummy);
if (pcase_insensitive)
mvwprintw(win -> win, win_y + 1, win_x, "%c", *pcase_insensitive?'X':' ');
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/ui.c
^
|
| @@ -50,7 +50,7 @@
win_header(mywin, title);
myattr_on(mywin, cdev);
- mvwprintw(mywin -> win, 3, 2, buffer);
+ mvwprintw(mywin -> win, 3, 2, "%s", buffer);
myattr_off(mywin, cdev);
escape_print(mywin, 7, 2, "_Press any key to exit this screen_");
mydoupdate();
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/utils.c
^
|
| @@ -953,33 +953,12 @@
char *gethome(char *user)
{
- char *path = NULL;
-
- for(;;)
- {
- struct passwd *p = getpwent();
-
- if (!p)
- break;
-
- if (user != NULL)
- {
- if (strcmp(p -> pw_name, user) == 0)
- {
- path = mystrdup(p -> pw_dir, __FILE__, __PRETTY_FUNCTION__, __LINE__);
- break;
- }
- }
- else if (p -> pw_uid == getuid())
- {
- path = mystrdup(p -> pw_dir, __FILE__, __PRETTY_FUNCTION__, __LINE__);
- break;
- }
- }
-
- endpwent();
-
- return path;
+ struct passwd *pw;
+ if (user)
+ pw = getpwnam(user);
+ else
+ pw = getpwuid(getuid());
+ return mystrdup(pw->pw_dir, __FILE__, __PRETTY_FUNCTION__, __LINE__);
}
char *myrealpath(char *in)
|
|
[-]
[+]
|
Changed |
multitail-5.2.9.tar.bz2/version
^
|
| @@ -1 +1 @@
-VERSION=5.2.6
+VERSION=5.2.9
|
