X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=3a6ed61eace92dc5d31a1fc66bb9301d47b6ce01;hb=9bea78d8f36cd5ab75d18e32224f0b90a635128c;hp=e758707887963aca31ddfae79785e39e36bcadc3;hpb=012d7fd50654b1623e63c447905187929e559cff;p=nfs-utils.git

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index e758707..3a6ed61 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -11,6 +11,7 @@
 #include <limits.h>
 #include <signal.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <getopt.h>
 #include <rpc/rpc.h>
@@ -23,6 +24,17 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+/* Added to enable specification of state directory path at run-time
+ * j_carlos_gomez@yahoo.com
+ */
+
+char * DIR_BASE = DEFAULT_DIR_BASE;
+
+char *  SM_DIR = DEFAULT_SM_DIR;
+char *  SM_BAK_DIR =  DEFAULT_SM_BAK_DIR;
+char *  SM_STAT_PATH = DEFAULT_SM_STAT_PATH;
+
+/* ----- end of state directory path stuff ------- */
 
 short int restart = 0;
 int	run_mode = 0;		/* foreground logging mode */
@@ -41,6 +53,8 @@ static struct option longopts[] =
 	{ "version", 0, 0, 'v' },
 	{ "outgoing-port", 1, 0, 'o' },
 	{ "port", 1, 0, 'p' },
+	{ "name", 1, 0, 'n' },
+	{ "state-directory-path", 1, 0, 'P' },
 	{ NULL, 0, 0, 0 }
 };
 
@@ -125,6 +139,8 @@ usage()
 	fprintf(stderr,"      -p, --port           Port to listen on\n");
 	fprintf(stderr,"      -o, --outgoing-port  Port for outgoing connections\n");
 	fprintf(stderr,"      -V, -v, --version    Display version information and exit.\n");
+	fprintf(stderr,"      -n, --name           Specify a local hostname.\n");
+	fprintf(stderr,"      -P                   State directory path.\n");
 }
 
 /* 
@@ -154,8 +170,11 @@ int main (int argc, char **argv)
 		version_p = VERSION;
 	}
 	
+	/* Set hostname */
+	MY_NAME = NULL;
+
 	/* Process command line switches */
-	while ((arg = getopt_long(argc, argv, "h?vVFdp:o:", longopts, NULL)) != EOF) {
+	while ((arg = getopt_long(argc, argv, "h?vVFdn:p:o:P:", longopts, NULL)) != EOF) {
 		switch (arg) {
 		case 'V':	/* Version */
 		case 'v':
@@ -185,6 +204,39 @@ int main (int argc, char **argv)
 				exit(1);
 			}
 			break;
+		case 'n':	/* Specify local hostname */
+			MY_NAME = xstrdup(optarg);
+			break;
+		case 'P':
+
+			if ((DIR_BASE = xstrdup(optarg)) == NULL) {
+				fprintf(stderr, "%s: xstrdup(%s) failed!\n",
+					argv[0], optarg);
+				exit(1);
+			}
+
+			SM_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm"));
+			SM_BAK_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm.bak"));
+			SM_STAT_PATH = xmalloc(strlen(DIR_BASE) + 1 + sizeof("state"));
+
+			if ((SM_DIR == NULL) 
+			    || (SM_BAK_DIR == NULL) 
+			    || (SM_STAT_PATH == NULL)) {
+
+				fprintf(stderr, "%s: xmalloc() failed!\n",
+					argv[0]);
+				exit(1);
+			}
+			if (DIR_BASE[strlen(DIR_BASE)-1] == '/') {
+				sprintf(SM_DIR, "%ssm", DIR_BASE );
+				sprintf(SM_BAK_DIR, "%ssm.bak", DIR_BASE );
+				sprintf(SM_STAT_PATH, "%sstate", DIR_BASE );
+			} else {
+				sprintf(SM_DIR, "%s/sm", DIR_BASE );
+				sprintf(SM_BAK_DIR, "%s/sm.bak", DIR_BASE );
+				sprintf(SM_STAT_PATH, "%s/state", DIR_BASE );
+			}
+			break;
 		case '?':	/* heeeeeelllllllpppp? heh */
 		case 'h':
 			usage();
@@ -216,7 +268,7 @@ int main (int argc, char **argv)
 #endif
 	
 	if (!(run_mode & MODE_NODAEMON)) {
-		int filedes;
+		int filedes, fdmax, tempfd;
 
 		if ((pid = fork ()) < 0) {
 			perror ("Could not fork");
@@ -229,7 +281,12 @@ int main (int argc, char **argv)
 		setsid ();
 		chdir (DIR_BASE);
 
-		for (filedes = 0; filedes < sysconf (_SC_OPEN_MAX); filedes++) {
+		tempfd = open("/dev/null", O_RDWR);
+		close(0); dup2(tempfd, 0);
+		close(1); dup2(tempfd, 1);
+		close(2); dup2(tempfd, 2);
+		fdmax = sysconf (_SC_OPEN_MAX);
+		for (filedes = 3; filedes < fdmax; filedes++) {
 			close (filedes);
 		}
 	}