Make nfsd use setproctitle from libutil...
Old code is still #ifdef OLD_SETPROCTITLE for comparison with the old code.
This commit is contained in:
parent
10dcae5806
commit
c129841af7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=13141
@ -3,6 +3,8 @@
|
||||
PROG= nfsd
|
||||
CFLAGS+=-DNFS
|
||||
MAN8= nfsd.8
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
|
||||
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
|
||||
|| defined(MAKE_EBONES))
|
||||
|
@ -81,6 +81,7 @@ static char sccsid[] = "@(#)nfsd.c 8.7 (Berkeley) 2/22/94";
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
#include <libutil.h>
|
||||
|
||||
/* Global defs */
|
||||
#ifdef DEBUG
|
||||
@ -91,8 +92,10 @@ int debug = 0;
|
||||
#endif
|
||||
|
||||
struct nfsd_srvargs nsd;
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
char **Argv = NULL; /* pointer to argument vector */
|
||||
char *LastArg = NULL; /* end of argv */
|
||||
#endif
|
||||
|
||||
#ifdef NFSKERB
|
||||
char lnam[ANAME_SZ];
|
||||
@ -108,9 +111,11 @@ NFSKERBKEYSCHED_T kerb_keysched;
|
||||
|
||||
void nonfs __P((int));
|
||||
void reapchild __P((int));
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
#ifdef __FreeBSD__
|
||||
void setproctitle __P((char *));
|
||||
#endif
|
||||
#endif
|
||||
void usage __P((void));
|
||||
|
||||
/*
|
||||
@ -167,6 +172,7 @@ main(argc, argv, envp)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
/* Save start and extent of argv for setproctitle. */
|
||||
Argv = argv;
|
||||
if (envp == 0 || *envp == 0)
|
||||
@ -174,6 +180,7 @@ main(argc, argv, envp)
|
||||
while (*envp)
|
||||
envp++;
|
||||
LastArg = envp[-1] + strlen(envp[-1]);
|
||||
#endif
|
||||
|
||||
#define MAXNFSDCNT 20
|
||||
#define DEFNFSDCNT 4
|
||||
@ -643,6 +650,7 @@ reapchild(signo)
|
||||
while (wait3(NULL, WNOHANG, NULL) > 0);
|
||||
}
|
||||
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
#ifdef __FreeBSD__
|
||||
void
|
||||
setproctitle(a)
|
||||
@ -660,3 +668,4 @@ setproctitle(a)
|
||||
Argv[1] = NULL;
|
||||
}
|
||||
#endif /* __FreeBSD__ */
|
||||
#endif
|
||||
|
@ -3,6 +3,8 @@
|
||||
PROG= nfsd
|
||||
CFLAGS+=-DNFS
|
||||
MAN8= nfsd.8
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
|
||||
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
|
||||
|| defined(MAKE_EBONES))
|
||||
|
@ -81,6 +81,7 @@ static char sccsid[] = "@(#)nfsd.c 8.7 (Berkeley) 2/22/94";
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
#include <libutil.h>
|
||||
|
||||
/* Global defs */
|
||||
#ifdef DEBUG
|
||||
@ -91,8 +92,10 @@ int debug = 0;
|
||||
#endif
|
||||
|
||||
struct nfsd_srvargs nsd;
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
char **Argv = NULL; /* pointer to argument vector */
|
||||
char *LastArg = NULL; /* end of argv */
|
||||
#endif
|
||||
|
||||
#ifdef NFSKERB
|
||||
char lnam[ANAME_SZ];
|
||||
@ -108,9 +111,11 @@ NFSKERBKEYSCHED_T kerb_keysched;
|
||||
|
||||
void nonfs __P((int));
|
||||
void reapchild __P((int));
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
#ifdef __FreeBSD__
|
||||
void setproctitle __P((char *));
|
||||
#endif
|
||||
#endif
|
||||
void usage __P((void));
|
||||
|
||||
/*
|
||||
@ -167,6 +172,7 @@ main(argc, argv, envp)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
/* Save start and extent of argv for setproctitle. */
|
||||
Argv = argv;
|
||||
if (envp == 0 || *envp == 0)
|
||||
@ -174,6 +180,7 @@ main(argc, argv, envp)
|
||||
while (*envp)
|
||||
envp++;
|
||||
LastArg = envp[-1] + strlen(envp[-1]);
|
||||
#endif
|
||||
|
||||
#define MAXNFSDCNT 20
|
||||
#define DEFNFSDCNT 4
|
||||
@ -643,6 +650,7 @@ reapchild(signo)
|
||||
while (wait3(NULL, WNOHANG, NULL) > 0);
|
||||
}
|
||||
|
||||
#ifdef OLD_SETPROCTITLE
|
||||
#ifdef __FreeBSD__
|
||||
void
|
||||
setproctitle(a)
|
||||
@ -660,3 +668,4 @@ setproctitle(a)
|
||||
Argv[1] = NULL;
|
||||
}
|
||||
#endif /* __FreeBSD__ */
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user