C++-ify lib.misc.

Makefile.global

@@ -62,12 +62,11 @@ endef
 # Library objects required in multiple places:
 LIBSBASE   = $(addprefix $(TOPDIR)/lib/,lib.error lib.misc)
 LIBHEADERS = $(addsuffix .h,$(LIBSBASE))
-LIBSOURCES = $(addsuffix .c,$(LIBSBASE))
 LIBOBJECTS = $(addsuffix $(OBJEXT),$(LIBSBASE))
 CFLAGS   += -I$(TOPDIR)/lib -I$(TOPDIR)/etc
 CXXFLAGS += -I$(TOPDIR)/lib -I$(TOPDIR)/etc
 
-$(LIBOBJECTS): %$(OBJEXT): %.c %.h
+$(LIBOBJECTS):
 	$(MAKE) -C $(TOPDIR)/lib $(notdir $@)
 
 # Default recursive targets; these should always at least call the

judge/Makefile

@@ -13,14 +13,14 @@ judgehost: $(TARGETS) $(SUBST_FILES)
 $(SUBST_FILES): %: %.in $(TOPDIR)/paths.mk
 	$(substconfigvars)
 
-evict: evict.cc $(LIBHEADERS) $(LIBSOURCES)
-	$(CXX) $(CXXFLAGS) -o $@ $< $(LIBSOURCES)
+evict: evict.cc $(LIBOBJECTS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBOBJECTS)
 
-runguard: runguard.cc $(LIBHEADERS) $(LIBSOURCES) $(TOPDIR)/etc/runguard-config.h
-	$(CXX) $(CXXFLAGS) -o $@ $< $(LIBSOURCES) $(LIBCGROUP)
+runguard: runguard.cc $(LIBOBJECTS) $(TOPDIR)/etc/runguard-config.h
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBOBJECTS) $(LIBCGROUP)
 
-runpipe: runpipe.cc $(LIBHEADERS) $(LIBSOURCES)
-	$(CXX) $(CXXFLAGS) -static -o $@ $< $(LIBSOURCES)
+runpipe: runpipe.cc $(LIBOBJECTS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -static -o $@ $< $(LIBOBJECTS)
 
 install-judgehost:
 	$(INSTALL_PROG) -t $(DESTDIR)$(judgehost_libjudgedir) \

judge/evict.cc

@@ -12,9 +12,10 @@
 #include <cstring>
 #include <cstdlib>
 
+#include "lib.misc.h"
+
 extern "C" {
 #include "lib.error.h"
-#include "lib.misc.h"
 }
 
 #define PROGRAM "evict"

judge/runguard.cc

@@ -29,6 +29,8 @@
 
 #include "config.h"
 
+#include "lib.misc.h"
+
 /* Some system/site specific config: VALID_USERS, CHROOT_PREFIX */
 #include "runguard-config.h"
 
@@ -346,17 +348,6 @@ void write_meta(const char *key, const char *format, ...)
 	va_end(ap);
 }
 
-void version(const char *prog, const char *vers)
-{
-	printf("\
-%s -- part of DOMjudge version %s\n\
-Written by the DOMjudge developers\n\n\
-DOMjudge comes with ABSOLUTELY NO WARRANTY.  This is free software, and you\n\
-are welcome to redistribute it under certain conditions.  See the GNU\n\
-General Public Licence for details.\n", prog, vers);
-	exit(0);
-}
-
 void usage()
 {
 	printf("\

judge/runpipe.cc

@@ -66,6 +66,7 @@
 #include "lib.misc.h"
 
 #include <algorithm>
+#include <array>
 #include <chrono>
 #include <csignal>
 #include <cstring>
@@ -232,22 +233,17 @@ struct process_t {
 
   // Fork and exec the child process, redirecting its standard I/O.
   void spawn() {
-    fd_t stdio[3] = {stdin_fd, stdout_fd, FDREDIR_NONE};
-
-    char pid_buf[12];
-    vector<const char *> argv;
-    for (size_t i = 0; i < args.size(); i++) {
-      argv.push_back(args[i].c_str());
-      if (i == 1 && cmd == "sudo" &&
-          args[i].find("/runguard") != string::npos) {
+    std::array<int, 3> stdio = {stdin_fd, stdout_fd, FDREDIR_NONE};
+
+    auto exec_args = args;
+    if (cmd == "sudo" && exec_args.size() > 1 && exec_args[1].find("/runguard") != string::npos) {
         // This is a hack, and can be improved significantly after implementing
         // https://docs.google.com/document/d/1WZRwdvJUamsczYC7CpP3ZIBU8xG6wNqYqrNJf7osxYs/edit#heading=h.i7kgdnmw8qd7
-        argv.push_back("-U");
-        sprintf(pid_buf, "%d", getpid());
-        argv.push_back(pid_buf);
-      }
+        exec_args.push_back("-U");
+        exec_args.push_back(std::to_string(getpid()));
     }
-    pid = execute(cmd.c_str(), argv.data(), argv.size(), stdio, 0);
+
+    pid = execute(cmd, exec_args, stdio, false);
     if (pid < 0) {
       error(errno, "failed to execute command #%ld", index);
     }

lib/Makefile

@@ -8,7 +8,8 @@ OBJECTS = $(addsuffix $(OBJEXT),lib.error lib.misc)
 
 build: $(OBJECTS)
 
-$(OBJECTS): %$(OBJEXT): %.c %.h
+lib.error$(OBJEXT): lib.error.c lib.error.h
+lib.misc$(OBJEXT): lib.misc.cc lib.misc.h
 
 clean-l:
 	rm -f $(OBJECTS)