head 1.1; access; symbols pkgsrc-2023Q4:1.1.0.172 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.170 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.168 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.166 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.164 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.162 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.160 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.158 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.156 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.154 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.152 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.150 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.148 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.146 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.142 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.122 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.144 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.140 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.138 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.136 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.134 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.132 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.130 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.128 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.126 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.124 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.120 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.118 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.116 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.114 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.112 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.110 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.108 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.106 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.104 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.102 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.100 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.98 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.96 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.94 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.92 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.90 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.88 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.86 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.84 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.82 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.80 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.78 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.76 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.74 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.72 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.70 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.68 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.66 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.64 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.62 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.60 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.58 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.56 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.54 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.52 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.50 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.48 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.46 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.44 pkgsrc-2008Q1:1.1.0.42 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.40 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.38 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.36 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.34 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.32 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.30 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.28 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.26 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.24 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.22 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.20 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.18 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.16 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.14 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.12 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.10 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.8 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.1 date 2002.07.04.13.32.21; author agc; state Exp; branches; next ; desc @@ 1.1 log @Add a test to see if a logfile has been turned over, and, if it has, start watching the new log file, rather than the old one. Bump revision to nb1. @ text @$NetBSD$ Add a test to see if the log file has been turned over, and to re-open files if it has. --- root-tail.c 2002/07/04 13:05:32 1.1 +++ root-tail.c 2002/07/04 13:18:38 @@@@ -27,14 +27,6 @@@@ #define VERSION "0.0.10" -/*---------------- Let's define signals functions -------------*/ - -static void reopen (int); -static void list_files (int); -static void force_refresh (int); -static void InstallSigHandler (void); -FILE *openLog (const char *); - /*------------------------ initalize variables -----------------*/ int geom_mask, noinitial; int screen, listlen = STD_HEIGHT, width = STD_WIDTH, ScreenWidth, ScreenHeight, @@@@ -58,6 +50,7 @@@@ char desc[255]; /* alternative description */ FILE *f; /* FILE struct associated with file */ Pixel color; /* color to be used for printing */ + struct stat st; /* stat buffer from previous */ struct logfile_entry *next; }; @@@@ -70,6 +63,14 @@@@ Pixel color; }; +/*---------------- Let's define signals functions -------------*/ + +static void reopen (int); +static void list_files (int); +static void force_refresh (int); +static void InstallSigHandler (void); +FILE *openLog (struct logfile_entry *, const char *); + /*----------------------------- start code ---------------------*/ @@@@ -83,7 +84,7 @@@@ { printf ("reopenin as %p (%s)\n", e->f, e->fname); fclose (e->f); - e->f = openLog (e->fname); + e->f = openLog (e, e->fname); printf ("reopened as %p\n", e->f); if (e->f == NULL) { @@@@ -226,15 +227,15 @@@@ } FILE * -openLog (const char *name) +openLog (struct logfile_entry *e, const char *name) { FILE *f = fopen (name, "r"); - struct stat statbuf; off_t size; + if (f == NULL) return NULL; - stat (name, &statbuf); - size = statbuf.st_size; + stat (name, &e->st); + size = e->st.st_size; if (size > (listlen+1) * width) { char dummy[255]; @@@@ -363,8 +364,16 @@@@ for (current = loglist; current != NULL; current = current->next) { + struct stat st; clearerr (current->f); + if (stat(current->fname, &st) < 0) { + continue; + } + if (st.st_ino != current->st.st_ino) { + need_reopen = 1; + } + while (!lineinput (temp, width + 2, current->f)) { /* @@@@ -418,7 +427,7 @@@@ if (need_reopen) reopen (1); - /* we ignore possible errors due to windo resizing &c */ + /* we ignore possible errors due to window resizing &c */ while (XPending (disp)) { XNextEvent (disp, &xev); @@@@ -607,13 +616,14 @@@@ } } - if ((f = openLog (fname)) == NULL) + e = (struct logfile_entry *) + malloc (sizeof (struct logfile_entry)); + + if ((f = openLog (e, fname)) == NULL) { perror (fname); exit (-1); } - e = (struct logfile_entry *) - malloc (sizeof (struct logfile_entry)); strncpy (e->fname, fname, 255); e->fname[255] = '\0'; /* just in case */ @