openssh unix dev - Nov 2000 - suggested bsd-setproctitle.c

Keven Steves, 

Can I suggest this minor change. To halt a bit of compiler grumble on
BSD4.3 platforms. 

It's complaining about unsued variable "__progname".

I wanted to check with you before committing it incase you had some
other plans in mind (and I know how I hate when others break my code =).

Thanks,

- Ben

--- ../openssh/bsd-setproctitle.c	Wed Oct 18 08:11:44 2000
+++ bsd-setproctitle.c	Sun Nov  5 16:59:07 2000
@@ -56,11 +56,13 @@
 
 #define	MAX_PROCTITLE	2048
 
-#ifdef HAVE___PROGNAME
-extern char *__progname;
-#else
-static const char *__progname = "sshd";
-#endif /* HAVE___PROGNAME */
+#if SPT_TYPE != SPT_NONE
+#  ifdef HAVE___PROGNAME
+  extern char *__progname;
+#  else
+  static const char *__progname = "sshd";
+#  endif /* HAVE___PROGNAME */
+#endif /* SPT_TYPE != SPT_NONE */
 
 /*
  * Set Process Title (SPT) defines.  Modeled after sendmail's

On Sun, 5 Nov 2000, Ben Lindstrom wrote:
: Can I suggest this minor change. To halt a bit of compiler grumble on
: BSD4.3 platforms. 
: 
: It's complaining about unsued variable "__progname".
: 
: I wanted to check with you before committing it incase you had some
: other plans in mind (and I know how I hate when others break my code =).

That should work.  But it seems this __progname issue could be cleaned
up by defining the variable in main() files if needed:

#ifndef HAVE___PROGNAME
const char *__progname = "foo";
#endif

then declaring it (no ifdefs) if it's referenced:

extern const char *__progname;

This gets us closer to OpenBSD's tree with fewer ifdefs.

I'll do this patch unless someone points out what it will break :)