Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/pkg_install/lib Set the environment variables to ha...



details:   https://anonhg.NetBSD.org/src/rev/a5b3d79d44f0
branches:  trunk
changeset: 481531:a5b3d79d44f0
user:      agc <agc%NetBSD.org@localhost>
date:      Tue Feb 01 10:46:55 2000 +0000

description:
Set the environment variables to have zero-length strings on Solaris.

diffstat:

 usr.sbin/pkg_install/lib/ftpio.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r c9e56de10a19 -r a5b3d79d44f0 usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Tue Feb 01 10:33:18 2000 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Tue Feb 01 10:46:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpio.c,v 1.11 2000/01/31 13:39:08 agc Exp $   */
+/*     $NetBSD: ftpio.c,v 1.12 2000/02/01 10:46:55 agc Exp $   */
 /*      Id: foo2.c,v 1.12 1999/12/17 02:31:57 feyrer Exp feyrer        */
 
 /*
@@ -283,6 +283,9 @@
 void 
 ftp_stop(void)
 {
+#if defined(__svr4__) && defined(__sun__)
+       char    env[BUFSIZ];
+#endif
        char *tmp1, *tmp2;
        
        if (!ftp_started)
@@ -300,7 +303,12 @@
                (void) close(ftpio.answer);
        }
 
-#if !(defined(__svr4__) && defined(__sun__))
+#if defined(__svr4__) && defined(__sun__)
+       (void) snprintf(env, sizeof(env), "%s=", PKG_FTPIO_COMMAND);
+       putenv(env);
+       (void) snprintf(env, sizeof(env), "%s=", PKG_FTPIO_ANSWER);
+       putenv(env);
+#else
        unsetenv(PKG_FTPIO_COMMAND); 
        unsetenv(PKG_FTPIO_ANSWER);
 #endif



Home | Main Index | Thread Index | Old Index