Fix Pack 005c: System Evaporation

include/config.h

@@ -528,9 +528,6 @@
 #define MENU_YPOS       13
 #define MENU_XPOS_REF   ((D_COLS_REF >> 1) + 23)  /* For `get[y|x]_ref()` & `move_ref()` */
 #define MENU_YPOS_REF   13
-#define MENU_LOAD       1
-#define MENU_DRAW       2
-#define MENU_FILM       4
 
 /* ----------------------------------------------------- */
 /* �t�ΰѼ�                                              */

include/dao.h

@@ -166,11 +166,24 @@ char *Ctime(const time_t *clock);
 char *Etime(const time_t *clock);
 char *Atime(const time_t *clock);
 char *Now(void);
+/* proc.c */
+int proc_runv(const char *path, const char *argv[]);
+GCC_CHECK_SENTINEL(0) int proc_runl(const char *path, const char *arg0, ...);
+int proc_runv_bg(const char *path, const char *argv[]);
+GCC_CHECK_SENTINEL(0) int proc_runl_bg(const char *path, const char *arg0, ...);
 /* xwrite.c */
 int xwrite(int fd, const char *data, int size);
 
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
 
+/* `proc_runl` without the need of `arg0` and trailing `NULL` */
+/* Use `PROC_CMD(path, NULL)` when no other arguments are needed */
+#define PROC_CMD(path, ...) proc_runl(path, path, __VA_ARGS__, NULL)
+
+/* `proc_runl_bg` without the need of `arg0` and trailing `NULL` */
+/* Use `PROC_CMD_BG(path, NULL)` when no other arguments are needed */
+#define PROC_CMD_BG(path, ...) proc_runl_bg(path, path, __VA_ARGS__, NULL)
+
 #endif  /* DAO_H */

include/dns.h

@@ -38,7 +38,7 @@ typedef union
     struct sockaddr_in6 v6;
 }     ip_addr;  /* SHMDATA(raw); dependency(UTMP) */
 
-#define IPADDR_NONE     TEMPLVAL(ip_addr, {0})
+#define IPADDR_NONE     LISTLIT(ip_addr){0}
 
 /*
  * The standard udp packet size PACKETSZ (512) is not sufficient for some

include/global.h

@@ -329,6 +329,8 @@
 #define I_TIMEOUT       0x04FD
 #define I_OTHERDATA     0x04FE
 
+#define I_RESIZETERM    Meta(Ctrl('L'))
+
 #define KEY_NONE        0x4000  /* All key values should `< KEY_NONE` */
 
 #define Ctrl(c)         ( c & ~0x0060 )

include/modes.h

@@ -10,6 +10,8 @@
 #ifndef MODES_H
 #define MODES_H
 
+#include "perm.h"
+
 enum
 {STRIP_ALL, ONLY_COLOR, NO_RELOAD};
 
@@ -21,15 +23,8 @@ enum
 /* user �ާ@���A�P�Ҧ�                                   */
 /* ----------------------------------------------------- */
 
-#if NO_SO
-#define M_DL(umode)     (umode)
-#else
-#define M_DL(umode)     (-(umode))  /* For dynamic library loading */
-#endif
-
-#define M_ARG           0x40000000  /* `item` is a function and a `void *` argument */
-
-#define M_MASK          0x0000FFFF  /* Mask for valid user modes */
+#define M_MENU          M_MMENU     /* The first menu mode */
+#define M_FUN           M_PROFESS   /* The first non-menu, non-idle mode */
 
 #define M_IDLE          0
 #define M_MMENU         1       /* menu mode */
@@ -135,13 +130,36 @@ static const char *const ModeTypeTable[] =
 
 
 /* ----------------------------------------------------- */
-/* menu.c �����Ҧ�                                       */
+/* menu.c & popupmenu.c �����Ҧ�                         */
 /* ----------------------------------------------------- */
 
+/* For `umode` */
+
+#if NO_SO
+#define M_DL(umode)     (umode)
+#else
+#define M_DL(umode)     ((umode) | 0x80000000)  /* For dynamic library loading */
+#endif
+
+#define M_QUIT          0x01000000  /* Return to the outer menu after selection */
+#define M_XO            0x02000000  /* `item` is a xover function */
+#define M_ARG           0x04000000  /* `item` is a function and a `void *` argument */
+
+#define M_DOINSTANT     0x00010000  /* Immidiately select a menu item after command match */
+#define M_MENUTITLE     0x00020000  /* `item` is a string for the menu title */
+#define M_TAIL_MASK     0x00FF0000  /* Mask for the flags which indicate the menu list tail */
+
+#define M_MASK          0x0000FFFF  /* Mask for valid user modes */
 
-#define XEASY   0x333           /* Return value to un-redraw screen */
-#define QUIT    0x666           /* Return value to abort recursive functions */
-#define SKIN    0x999           /* Return value to change skin */
+/* For `level` */
+
+#define PERM_MENU       PERM_PURGE  /* A permission flag reserved for valid users */
+
+/* Traditional return values */
+
+#define XEASY   XO_FOOT         /* Return value to un-redraw screen */
+#define QUIT    XO_QUIT         /* Return value to abort recursive functions */
+#define SKIN    XO_SKIN         /* Return value to change skin */
 
 
 /* ----------------------------------------------------- */
@@ -244,6 +262,12 @@ static const char *const ModeTypeTable[] =
 #define XO_LAST         ((XZ_ZONE | XZ_BACK) + XO_NONE)
 #define XO_QUIT         ((XZ_ZONE | XZ_QUIT) + XO_NONE)
 
+/* Miscellaneous commands ({XO_WRAP|XO_SCRL|XO_REL} + key; key <= KEY_NONE) */
+#define XO_CUR          (XO_REL + XO_CUR_BIAS)  /* Redraw the item under the cursor and do relative move */
+#define XO_CUR_BIAS     0x2000               /* Bias of relative move */
+#define XO_CUR_MIN      (XO_REL + 0)         /* The minimum value of relative move */
+#define XO_CUR_MAX      (XO_REL + KEY_NONE)  /* The maximum value of relative move */
+
 /* Special values */
 
 //#define XO_RSIZ         256             /* max record length */ /* IID.20200102: Unlimited. */
@@ -272,10 +296,12 @@ static const char *const ModeTypeTable[] =
 #define XZ_FINI         0x02000000      /* Perform finalization tasks for a zone */
 #define XZ_BACK         0x04000000      /* Return to the last zone */
 #define XZ_QUIT         0x08000000      /* Exit `xover()` */
-#define XZ_UNUSED4      0x10000000
+#define XZ_SKIN         0x10000000      /* Change the skin instead of the zone */
+
 #define XZ_UNUSED5      0x20000000
 
 #define XO_ZONE         (XZ_ZONE + XO_MOVE)
+#define XO_SKIN         ((XZ_ZONE | XZ_SKIN) + XO_MOVE)
 
 /* Zone indexes */
 

include/popup.h

@@ -10,21 +10,19 @@
 #ifndef POPUP_H
 #define POPUP_H
 
-#define POPUP_QUIT              0x00
-#define POPUP_FUN               0x01
-#define POPUP_XO                0x02
-#define POPUP_MENU              0x04
-#define POPUP_MENUTITLE         0x08
+#include "modes.h"
+
+#define POPUP_QUIT              M_QUIT
+#define POPUP_FUN               M_FUN
+#define POPUP_XO                (M_FUN | M_XO)
+#define POPUP_MENU              M_MENU
+#define POPUP_MENUTITLE         (M_MENU | M_MENUTITLE)
 #if NO_SO
-  #define POPUP_SO              POPUP_FUN
+  #define POPUP_SO              M_FUN
 #else
-  #define POPUP_SO              0x10  /* For dynamic library loading */
+  #define POPUP_SO              M_DL(M_FUN) /* For dynamic library loading */
 #endif
 
-#define POPUP_DO_INSTANT        0x01000000
-
-#define POPUP_ARG               0x40000000  /* `item` is a function and a `void *` argument */
-
-#define POPUP_MASK              0x000000FF
+#define POPUP_ARG               M_ARG  /* `item` is a function and a `void *` argument */
 
 #endif  /* #ifndef POPUP_H */

include/proto.h

@@ -75,6 +75,7 @@ void brd_edit(int bno);
 int a_editbrd(void);
 int u_verify(void);
 /* bbsd.c */
+void blog_pid(const char *mode, const char *msg, pid_t pid);
 void blog(const char *mode, const char *msg);
 void u_exit(const char *mode);
 GCC_NORETURN void abort_bbs(void);
@@ -89,6 +90,7 @@ int Ben_Perm(const BRD *bhdr, unsigned int ulevel);
 GCC_PURE int bstamp2bno(time_t stamp);
 void brh_load(void);
 void brh_save(void);
+bool XoPostSimple(int bno);
 bool XoPost(int bno);
 void board_outs(int chn, int num);
 void class_outs(const char *title, int num);
@@ -173,6 +175,7 @@ void vs_mid(const char *mid);
 void vs_head(const char *title, const char *mid);
 void clear_notification(void);
 void movie(void);
+GCC_PURE int strip_ansi_n_len(const char *str, int maxlen);
 GCC_PURE int strip_ansi_len(const char *str);
 const char *check_info(const char *input);
 void main_menu(void);
@@ -313,6 +316,7 @@ void grayoutrect(int y, int yend, int x, int xend, int level);
 void grayout(int y, int end, int level);
 #endif  /* #ifndef M3_USE_PFTERM */
 void add_io(int fd, int timeout);
+int iac_process(const unsigned char *current, const unsigned char *end, int *pcount);
 int iac_count(const unsigned char *current);
 int igetch(void);
 BRD *ask_board(char *board, unsigned int perm, const char *msg);
@@ -343,7 +347,9 @@ int xo_cb_foot(XO *xo);
 int xo_cb_last(XO *xo);
 int xo_cb_quit(XO *xo);
 void xover(int cmd);
-void every_Z(void);
+int xover_exec_cb(XO *xo, int cmd);
+int xover_key(XO *xo, int zone, int cmd);
+void every_Z(XO *xo);
 void every_U(void);
 void every_B(void);
 void every_S(void);

include/struct.h

@@ -1096,42 +1096,59 @@ typedef struct PostRecommendHistory
 #endif  /* #if 0 */
 
 typedef struct {
-    int (*func)(const void *arg);
+    union {
+        int (*func)(const void *arg);
+        int (*xofunc)(XO *xo, const void *arg);
+    };
     const void *arg;
 } FuncArg;
 
 typedef struct {
+    union {
 #if NO_SO
-    int (*func)(const void *arg);
+        int (*func)(const void *arg);
+        int (*xofunc)(XO *xo, const void *arg);
 #else
-    const char *func;
+        const char *func;
+        const char *xofunc;
 #endif
+    };
     const void *arg;
 } DlFuncArg;
 
-typedef union {  /* The field to be used is determined by the value of `umode` */
-    int (*func) (void);  /* Default (menu) or `POPUP_FUN` (popupmenu) */
-    FuncArg funcarg;  /* `umode | M_ARG` (menu) or `umode | POPUP_FUN` (popupmenu) */
-
-    int (*xofunc) (XO *xo);  /* `POPUP_XO` (popupmenu) */
-
-
+typedef union {
+    /* The field to be used is determined by the value of `umode` */
 #if NO_SO
-    int (*dlfunc) (void);  /* `M_DL(umode)` (menu & popupmenu) or `POPUP_SO` (popupmenu) */
+    int (*func) (void);  /* `M_DL(umode)`, `umode` `>= M_FUN` or `M_IDLE` */
+    int (*xofunc) (XO *xo);  /* `M_DL(umode | M_XO)` */
+    const char *title;  /* `M_DL(umode | M_MENUTITLE)` */
+    struct MENU *menu;  /* `M_DL(umode)`, `umode` `>= M_MENU` and `< M_FUN` */
 #else
-    const char *dlfunc;
+    const char *func;
+    const char *xofunc;
+    const char *title;
+    const char *menu;
 #endif
-    DlFuncArg dlfuncarg;  /* `M_DL(umode | M_ARG)` (menu) or `POPUP_SO | POPUP_ARG)` (popupmenu) */
+} DlMenuItem;
+
+typedef union {
+    /* The field to be used is determined by the value of `umode` */
+    int (*func) (void);  /* `>= M_FUN` or `M_IDLE` */
+    int (*xofunc) (XO *xo);  /* `umode | M_XO` */
+    FuncArg funcarg;  /* `umode | M_ARG` */
+
+    DlMenuItem dl;  /* `M_DL(umode)` */
+    DlFuncArg dlfuncarg;  /* `M_DL(umode) | M_ARG` */
 
-    const char *title;  /* `POPUP_MENUTITLE` (popupmenu) */
-    struct MENU *menu;  /* `<= M_XMENU` (menu) or `POPUP_MENU` (popupmenu) */
+    const char *title;  /* `umode | M_MENUTITLE` */
+    struct MENU *menu;  /* `>= M_MENU` and `< M_FUN` */
 } MenuItem;
 
 typedef struct MENU
 {
     MenuItem item;
     unsigned int level;
-    int umode;
+    unsigned int umode;
     const char *desc;
 } MENU;
 

lib/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(dao STATIC
     acl.c       chrono32.c  file.c    isnot.c    radix32.c   shm.c
     archiv32.c  dl_lib.c    record.c  splay.c    date_str.c  xsort.c
     attr_lib.c  dns.c       header.c  rfc2047.c  string.c    xwrite.c
+    proc.c
 )
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     target_link_libraries(dao PRIVATE -m32)

lib/Makefile

@@ -14,11 +14,13 @@ HDR 	= dao.h dao.p
 
 SRC	= acl.c       chrono32.c  file.c    isnot.c    radix32.c   shm.c   \
 	  archiv32.c  dl_lib.c    record.c  splay.c    date_str.c  xsort.c \
-	  attr_lib.c  dns.c       header.c  rfc2047.c  string.c    xwrite.c
+	  attr_lib.c  dns.c       header.c  rfc2047.c  string.c    xwrite.c \
+	  proc.c
 
 OBJ	= acl.o       chrono32.o  file.o    isnot.o    radix32.o   shm.o   \
 	  archiv32.o  dl_lib.o    record.o  splay.o    date_str.o  xsort.o \
-	  attr_lib.o  dns.o       header.o  rfc2047.o  string.o    xwrite.o
+	  attr_lib.o  dns.o       header.o  rfc2047.o  string.o    xwrite.o \
+	  proc.o
 
 .c.o:   ;$(CC) $(CFLAGS) -c $*.c