fix: move JSON envelope to print.c, add version.h build deps

kurok · kurok · commit 34d6b1b48892 · 2026-03-12T12:51:19.000Z
Refactors json_open_envelope/json_close_envelope into print.c
which already includes version.h via the correct build ordering.
Updates all dialect Makefiles to add version.h as a dependency
for print.o.
diff --git a/lib/dialects/aix/Makefile b/lib/dialects/aix/Makefile
@@ -155,7 +155,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/darwin/Makefile b/lib/dialects/darwin/Makefile
@@ -162,7 +162,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/freebsd/Makefile b/lib/dialects/freebsd/Makefile
@@ -141,7 +141,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/hpux/kmem/Makefile b/lib/dialects/hpux/kmem/Makefile
@@ -147,7 +147,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/hpux/pstat/Makefile b/lib/dialects/hpux/pstat/Makefile
@@ -136,7 +136,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/linux/Makefile b/lib/dialects/linux/Makefile
@@ -167,7 +167,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/netbsd/Makefile b/lib/dialects/netbsd/Makefile
@@ -145,7 +145,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/openbsd/Makefile b/lib/dialects/openbsd/Makefile
@@ -145,7 +145,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/osr/Makefile b/lib/dialects/osr/Makefile
@@ -151,7 +151,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/sun/Makefile b/lib/dialects/sun/Makefile
@@ -146,7 +146,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/dialects/uw/Makefile b/lib/dialects/uw/Makefile
@@ -145,7 +145,7 @@ misc.o:		${HDR} misc.c
 
 node.o:		${HDR} node.c
 
-print.o:	${HDR} print.c
+print.o:	${HDR} version.h print.c
 
 proc.o:		${HDR} proc.c
 
diff --git a/lib/proto.h b/lib/proto.h
@@ -187,6 +187,8 @@ extern void print_init(struct lsof_context *ctx);
 extern void printname(struct lsof_context *ctx, int nl);
 extern char *print_kptr(KA_T kp, char *buf, size_t bufl);
 extern int print_proc(struct lsof_context *ctx);
+extern void json_open_envelope(void);
+extern void json_close_envelope(void);
 extern void fd_to_string(enum lsof_fd_type fd_type, int fd_num, char *buf);
 extern void printrawaddr(struct lsof_context *ctx, struct sockaddr *sa);
 extern void print_tcptpi(struct lsof_context *ctx, int nl);
diff --git a/src/main.c b/src/main.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 #include "cli.h"
-#include "version.h"
 
 /*
  * Local definitions
@@ -1392,8 +1391,7 @@ int main(int argc, char *argv[]) {
                         (size_t)sizeof(struct lproc *), comppid);
         }
         if (Fjson) {
-            printf("{\"lsof_version\":\"%s\",\"processes\":[", LSOF_VERSION);
-            Fjson_first_proc = 1;
+            json_open_envelope();
         }
         if ((n = Nlproc)) {
 
@@ -1552,7 +1550,7 @@ int main(int argc, char *argv[]) {
             Lf = lf;
         }
         if (Fjson) {
-            printf("]}\n");
+            json_close_envelope();
         } else if (Fjsonl && RptTm) {
             putchar('\n');
         }
diff --git a/src/print.c b/src/print.c
@@ -31,6 +31,7 @@
 #include "common.h"
 #include "cli.h"
 #include "proto.h"
+#include "version.h"
 #include <inttypes.h>
 
 /*
@@ -1865,6 +1866,21 @@ int human_readable_size(SZOFFTYPE sz, int print, int col) {
     return strlen(buf);
 }
 
+/*
+ * json_open_envelope() - emit JSON opening envelope for -J mode
+ */
+void json_open_envelope(void) {
+    printf("{\"lsof_version\":\"%s\",\"processes\":[", LSOF_VERSION);
+    Fjson_first_proc = 1;
+}
+
+/*
+ * json_close_envelope() - emit JSON closing envelope for -J mode
+ */
+void json_close_envelope(void) {
+    printf("]}\n");
+}
+
 /*
  * json_print_file() - print a single file entry as JSON fields
  */
