summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-20 13:15:10 +1100
committerDamien Miller <djm@mindrot.org>2003-01-20 13:15:10 +1100
commit140344b8097ccf596b40131c1b22bef8139631f4 (patch)
tree62b6af6f4984edcd28ac533bd9ec61065ea03f03
parente443e9398eb95f95bee82009cfae30951646c6e9 (diff)
- (djm) Fix compilation for NetBSD from dtucker@zip.com.au
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/setproctitle.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c64c24e5..2f9adb864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120030120
2 - (djm) Fix compilation for NetBSD from dtucker@zip.com.au
3
120030118 420030118
2 - (djm) Revert fix for Bug #442 for now. 5 - (djm) Revert fix for Bug #442 for now.
3 6
@@ -1034,4 +1037,4 @@
1034 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1037 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1035 ok provos@ 1038 ok provos@
1036 1039
1037$Id: ChangeLog,v 1.2575 2003/01/18 05:24:06 djm Exp $ 1040$Id: ChangeLog,v 1.2576 2003/01/20 02:15:10 djm Exp $
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 14d5d2f3c..07af7e9c0 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -31,7 +31,7 @@
31 * to contain some useful information. Mechanism differs wildly across 31 * to contain some useful information. Mechanism differs wildly across
32 * platforms. 32 * platforms.
33 * 33 *
34 * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.4 2003/01/12 23:04:59 djm Exp $ 34 * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.5 2003/01/20 02:15:11 djm Exp $
35 * 35 *
36 * Copyright 2000 by PostgreSQL Global Development Group 36 * Copyright 2000 by PostgreSQL Global Development Group
37 * various details abducted from various places 37 * various details abducted from various places
@@ -51,8 +51,6 @@
51#include <sys/exec.h> 51#include <sys/exec.h>
52#endif 52#endif
53 53
54extern char **environ;
55
56/*------ 54/*------
57 * Alternative ways of updating ps display: 55 * Alternative ways of updating ps display:
58 * 56 *
@@ -86,6 +84,9 @@ extern char **environ;
86#ifndef SETPROCTITLE_PS_PADDING 84#ifndef SETPROCTITLE_PS_PADDING
87# define SETPROCTITLE_PS_PADDING ' ' 85# define SETPROCTITLE_PS_PADDING ' '
88#endif 86#endif
87#endif /* HAVE_SETPROCTITLE */
88
89extern char **environ;
89 90
90/* 91/*
91 * argv clobbering uses existing argv space, all other methods need a buffer 92 * argv clobbering uses existing argv space, all other methods need a buffer
@@ -104,6 +105,7 @@ static char **save_argv;
104 105
105extern char *__progname; 106extern char *__progname;
106 107
108#ifndef HAVE_SETPROCTITLE
107/* 109/*
108 * Call this to update the ps status display to a fixed prefix plus an 110 * Call this to update the ps status display to a fixed prefix plus an
109 * indication of what you're currently doing passed in the argument. 111 * indication of what you're currently doing passed in the argument.