Module Name: src
Committed By: dholland
Date: Sat Mar 29 20:12:12 UTC 2014
Modified Files:
src/games/hunt/huntd: driver.c faketalk.c
Log Message:
Use setproctitle() instead of handrolled version.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/games/hunt/huntd/driver.c
cvs rdiff -u -r1.21 -r1.22 src/games/hunt/huntd/faketalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hunt/huntd/driver.c
diff -u src/games/hunt/huntd/driver.c:1.25 src/games/hunt/huntd/driver.c:1.26
--- src/games/hunt/huntd/driver.c:1.25 Sat Mar 29 20:10:10 2014
+++ src/games/hunt/huntd/driver.c Sat Mar 29 20:12:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: driver.c,v 1.25 2014/03/29 20:10:10 dholland Exp $ */
+/* $NetBSD: driver.c,v 1.26 2014/03/29 20:12:12 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: driver.c,v 1.25 2014/03/29 20:10:10 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.26 2014/03/29 20:12:12 dholland Exp $");
#endif /* not lint */
#include <sys/ioctl.h>
@@ -47,8 +47,6 @@ __RCSID("$NetBSD: driver.c,v 1.25 2014/0
static SOCKET Daemon;
-char *First_arg; /* pointer to argv[0] */
-char *Last_arg; /* pointer to end of argv/environ */
#ifdef INTERNET
static int Test_socket; /* test socket to answer datagrams */
@@ -64,7 +62,6 @@ static u_short stat_port; /* port # of
static void clear_scores(void);
static bool havechar(PLAYER *, int);
static void init(void);
-int main(int, char *[], char *[]);
static void makeboots(void);
static void send_stats(void);
static void zap(PLAYER *, bool, int);
@@ -75,7 +72,7 @@ static void zap(PLAYER *, bool, int);
* The main program.
*/
int
-main(int ac, char **av, char **ep)
+main(int ac, char **av)
{
PLAYER *pp;
#ifdef INTERNET
@@ -89,13 +86,6 @@ main(int ac, char **av, char **ep)
int c, i;
const int linger = 90 * 1000;
- First_arg = av[0];
- if (ep == NULL || *ep == NULL)
- ep = av + ac;
- while (*ep)
- ep++;
- Last_arg = ep[-1] + strlen(ep[-1]);
-
while ((c = getopt(ac, av, "sp:")) != -1) {
switch (c) {
case 's':
Index: src/games/hunt/huntd/faketalk.c
diff -u src/games/hunt/huntd/faketalk.c:1.21 src/games/hunt/huntd/faketalk.c:1.22
--- src/games/hunt/huntd/faketalk.c:1.21 Sat Mar 29 20:10:10 2014
+++ src/games/hunt/huntd/faketalk.c Sat Mar 29 20:12:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: faketalk.c,v 1.21 2014/03/29 20:10:10 dholland Exp $ */
+/* $NetBSD: faketalk.c,v 1.22 2014/03/29 20:12:12 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.21 2014/03/29 20:10:10 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.22 2014/03/29 20:12:12 dholland Exp $");
#endif /* not lint */
#include "bsd.h"
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: faketalk.c,v 1.21 2014
#include <netdb.h>
#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "talk_ctl.h"
@@ -60,8 +61,6 @@ __RCSID("$NetBSD: faketalk.c,v 1.21 2014
#define ARGV0 "HUNT-ANNOUNCE"
extern char *my_machine_name;
-extern char *First_arg, *Last_arg;
-extern char **environ;
static void do_announce(char *);
void exorcise(int);
@@ -89,8 +88,6 @@ faketalk(void)
FILE *f;
int service; /* socket of service */
struct sockaddr_in des; /* address of destination */
- char *a;
- const char *b;
(void) signal(SIGCHLD, exorcise);
@@ -103,13 +100,7 @@ faketalk(void)
/*
* change argv so that a ps shows ARGV0
*/
- *environ = NULL;
- for (a = First_arg, b = ARGV0; a < Last_arg; a++) {
- if (*b)
- *a = *b++;
- else
- *a = ' ';
- }
+ setproctitle("%s", ARGV0);
/*
* initialize "talk"
