Changeset 82d3c1f in code

Timestamp:

Mar 7, 2014, 5:37:37 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

709589d

Parents:

9c04f2a

Message:

stat(2) the modtab every time pass is requested

plus some minor style changes

Files:

• icb.c (modified) (1 diff)
• icb.h (modified) (1 diff)
• icbd.c (modified) (7 diffs)
• icbd.h (modified) (1 diff)

icb.c

@@ -551 +551 @@
         extern int modtabcnt;
 
+        icbd_modupdate();
         if ((enforce ? 0 : modtabcnt == 0) ||
             bsearch(is->nick, modtab, modtabcnt, ICB_MAXNICKLEN,

icb.h

@@ -129 +129 @@
 
 /* icb.c */
-struct icb_group *icb_addgroup(struct icb_session *, char *, char *);
-void             icb_cmdout(struct icb_session *, int, char *);
-void             icb_delgroup(struct icb_group *);
-void             icb_error(struct icb_session *, const char *, ...);
-void             icb_init(struct icbd_callbacks *);
-void             icb_input(struct icb_session *);
-inline int       icb_ismod(struct icb_group *, struct icb_session *);
-int              icb_modpermit(struct icb_session *, int);
-int              icb_pass(struct icb_group *, struct icb_session *,
-                     struct icb_session *);
-void             icb_privmsg(struct icb_session *, char *, char *);
-void             icb_remove(struct icb_session *, char *);
-void             icb_sendfmt(struct icb_session *, const char *, ...);
-void             icb_start(struct icb_session *);
-void             icb_status(struct icb_session *, int, const char *, ...);
-void             icb_status_group(struct icb_group *, struct icb_session *,
+struct icb_group *
+                icb_addgroup(struct icb_session *, char *, char *);
+void            icb_cmdout(struct icb_session *, int, char *);
+void            icb_delgroup(struct icb_group *);
+void            icb_error(struct icb_session *, const char *, ...);
+void            icb_init(struct icbd_callbacks *);
+void            icb_input(struct icb_session *);
+inline int      icb_ismod(struct icb_group *, struct icb_session *);
+int             icb_modpermit(struct icb_session *, int);
+int             icb_pass(struct icb_group *, struct icb_session *,
+                    struct icb_session *);
+void            icb_privmsg(struct icb_session *, char *, char *);
+void            icb_remove(struct icb_session *, char *);
+void            icb_sendfmt(struct icb_session *, const char *, ...);
+void            icb_start(struct icb_session *);
+void            icb_status(struct icb_session *, int, const char *, ...);
+void            icb_status_group(struct icb_group *, struct icb_session *,
                     int, const char *, ...);
-void             icb_who(struct icb_session *, struct icb_group *);
-int              icb_vis(char *, const char *, size_t, int);
+void            icb_who(struct icb_session *, struct icb_group *);
+int             icb_vis(char *, const char *, size_t, int);
 
 /* callbacks from icbd.c */

icbd.c

@@ -44 +44 @@
 
 uint64_t sessionid;
+struct stat modtabst;
 char modtabpath[MAXPATHLEN];
 char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
@@ -64 +65 @@
 void icbd_log(struct icb_session *, int, const char *, ...);
 void icbd_grplist(char *);
-void icbd_modtab(char *);
 void icbd_restrict(void);
 void icbd_write(struct icb_session *, char *, ssize_t);
-void icbd_signal(int);
 
 static inline int icbd_session_cmp(struct icb_session *, struct icb_session *);
@@ -82 +81 @@
 main(int argc, char *argv[])
 {
-        struct event ev_sig;
         struct icbd_callbacks ic = { icbd_drop, icbd_log, icbd_write };
         const char *cause = NULL;
@@ -239 +237 @@
                 icbd_restrict();
 
+        icbd_modupdate();
+
         (void)signal(SIGPIPE, SIG_IGN);
-        if (strlen(modtabpath) > 0) {
-                icbd_modtab(modtabpath);
-                signal_set(&ev_sig, SIGHUP,
-                    (void (*)(int, short, void *))icbd_signal, NULL);
-                signal_add(&ev_sig, NULL);
-        }
 
         (void)event_dispatch();
@@ -549 +543 @@
 
 void
-icbd_modtab(char *mtab)
-{
+icbd_modupdate(void)
+{
+        struct stat st;
         FILE *fp;
         char *buf, *lbuf;
         size_t len;
 
-        if ((fp = fopen(mtab, "r")) == NULL)
-                err(EX_NOINPUT, "%s", mtab);
+        if (strlen(modtabpath) == 0)
+                return;
+        if (stat(modtabpath, &st)) {
+                syslog(LOG_ERR, "stat %s", modtabpath);
+                return;
+        }
+        /* see if there are any changes */
+        if (timespeccmp(&st.st_mtim, &modtabst.st_mtim, ==) ||
+            st.st_size == 0)
+                return;
+
+        if ((fp = fopen(modtabpath, "r")) == NULL)
+                err(EX_NOINPUT, "open %s", modtabpath);
 
         modtabcnt = 0;
@@ -577 +583 @@
                         continue;
                 strlcpy(modtab[modtabcnt++], buf, ICB_MAXNICKLEN);
+                fprintf(stderr, "%s\n", buf);
         }
         free(lbuf);
@@ -584 +591 @@
 
         fclose(fp);
-}
-
-void
-icbd_signal(int sig)
-{
-        switch (sig) {
-        case SIGHUP:
-                if (strlen(modtabpath) > 0)
-                        icbd_modtab(modtabpath);
-                break;
-        default:
-                syslog(LOG_WARNING, "unexpected signal %d", sig);
-                break;
-        }
 }
 

icbd.h

@@ -24 +24 @@
 
 /* icbd.c */
-inline struct icb_session *icbd_session_lookup(uint64_t);
-time_t  getmonotime(void);
+inline struct icb_session *
+                icbd_session_lookup(uint64_t);
+void            icbd_modupdate(void);
+time_t          getmonotime(void);
 
 /* dns.c */
 struct sockaddr_storage;
-int     dns_init(void);
-void    dns_rresolv(struct icb_session *, struct sockaddr_storage *);
+int             dns_init(void);
+void            dns_rresolv(struct icb_session *, struct sockaddr_storage *);
 
 /* logger.c */
-int     logger_init(void);
-void    logger(char *, char *, char *);
+int             logger_init(void);
+void            logger(char *, char *, char *);