More C++ stuff.

Author: meisterT

judge/runguard.cc

@@ -35,47 +35,49 @@
 /* For chroot(), which is not POSIX. */
 #define _DEFAULT_SOURCE
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/param.h>
+#include <algorithm>
+#include <cerrno>
+#include <csignal>
+#include <climits>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <fcntl.h>
+#include <fnmatch.h>
+#include <getopt.h>
+#include <grp.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <pwd.h>
+#include <regex.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/resource.h>
 #include <sys/select.h>
 #include <sys/stat.h>
+#include <sys/sysinfo.h>
 #include <sys/time.h>
 #include <sys/times.h>
-#include <sys/resource.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
+#include <sys/wait.h>
+#include <sys/param.h>
 #include <unistd.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <getopt.h>
-#include <fnmatch.h>
-#include <regex.h>
-#include <pwd.h>
-#include <grp.h>
-#include <time.h>
-#include <math.h>
-#include <limits.h>
-#include <inttypes.h>
 #include <libcgroup.h>
-#include <sched.h>
-#include <sys/sysinfo.h>
 
 #define PROGRAM "runguard"
 #define VERSION DOMJUDGE_VERSION "/" REVISION
 
-#define max(x,y) ((x) > (y) ? (x) : (y))
-#define min(x,y) ((x) < (y) ? (x) : (y))
-
 /* Array indices for input/output file descriptors as used by pipe() */
 #define PIPE_IN  1
 #define PIPE_OUT 0
 
-#define BUF_SIZE 4*1024
+const size_t BUF_SIZE = 4*1024;
 
 /* Types of time for writing to file. */
 #define WALL_TIME_TYPE 0
@@ -901,7 +903,7 @@ void pump_pipes(fd_set* readfds, size_t data_read[], size_t data_passed[])
 				/* Otherwise copy the output to a file */
 				to_read = BUF_SIZE;
 				if (limit_streamsize) {
-					to_read = min(BUF_SIZE, streamsize-data_passed[i]);
+					to_read = std::min(BUF_SIZE, streamsize-data_passed[i]);
 				}
 
 				if ( use_splice ) {
@@ -1359,7 +1361,7 @@ int main(int argc, char **argv)
 			for(i=1; i<=2; i++) {
 				if ( child_pipefd[i][PIPE_OUT]>=0 ) {
 					FD_SET(child_pipefd[i][PIPE_OUT],&readfds);
-					nfds = max(nfds,child_pipefd[i][PIPE_OUT]);
+					nfds = std::max(nfds,child_pipefd[i][PIPE_OUT]);
 				}
 			}