OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Oct-2006 08:22:00
Branch: HEAD Handle: 2006100607220000
Modified files:
openpkg-src/honeyd honeyd.spec setenv.c setenv.h
Log:
fix setenv function by using a copy of a newer version
Summary:
Revision Changes Path
1.63 +1 -1 openpkg-src/honeyd/honeyd.spec
1.7 +9 -45 openpkg-src/honeyd/setenv.c
1.2 +4 -29 openpkg-src/honeyd/setenv.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 25 Aug 2006 19:16:48 -0000 1.62
+++ openpkg-src/honeyd/honeyd.spec 6 Oct 2006 06:22:00 -0000 1.63
@@ -37,7 +37,7 @@
Group: Security
License: BSD
Version: %{V_honeyd}
-Release: 20060825
+Release: 20061006
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/setenv.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 setenv.c
--- openpkg-src/honeyd/setenv.c 24 Aug 2006 10:19:04 -0000 1.6
+++ openpkg-src/honeyd/setenv.c 6 Oct 2006 06:22:00 -0000 1.7
@@ -1,62 +1,26 @@
-/*
-** setenv.c: ISO C implementation
-** Copyright (c) 2003 Michael Schloh von Bennewitz <[EMAIL PROTECTED]>
-** Copyright (c) 2003 Cable & Wireless <http://www.cw.com/de/>
-**
-** Permission to use, copy, modify, and distribute this software for
-** any purpose with or without fee is hereby granted, provided that
-** the above copyright notice and this permission notice appear in all
-** copies.
-**
-** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-** IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-** USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-** SUCH DAMAGE.
-**
-*/
+#ifndef HAVE_SETENV
#ifdef HAVE_CONFIG_H
-#include <sys/types.h>
#include "config.h"
#endif
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
-#ifndef HAVE_SETENV
-#include <stdlib.h> /* For putenv(3) and malloc(3) */
-#include <string.h> /* For strcpy(3) and strcat(3) */
-
-
-/*
-** Implements setenv C library function for platforms not including it
-*/
int setenv(const char *kszName, const char *kszValue, int nOverwrite)
{
- char *szPair = NULL; /* String we will pass to putenv(3) */
+ char *szPair = NULL;
- /* Short circuit if overwrite is not enabled on an existing variable */
if (nOverwrite == 0 && getenv(kszName) != 0)
return 0;
-
- /* Allocate space for name, value, equals, and string terminator */
szPair = malloc(strlen(kszName) + 1 + strlen(kszValue) + 1);
-
- if (szPair == NULL) /* Memory error */
- return -1; /* Unsuccessful */
-
- /* Copy the incoming variables */
+ if (szPair == NULL)
+ return -1;
strcpy(szPair, kszName);
strcat(szPair, "=");
strcat(szPair, kszValue);
- putenv(szPair); /* Handoff */
-
- return 0; /* Success */
+ putenv(szPair);
+ return 0;
}
#endif /* !HAVE_SETENV */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/setenv.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 setenv.h
--- openpkg-src/honeyd/setenv.h 24 Sep 2003 22:37:23 -0000 1.1
+++ openpkg-src/honeyd/setenv.h 6 Oct 2006 06:22:00 -0000 1.2
@@ -1,29 +1,4 @@
-/*
-** setenv.h: ISO C interface
-** Copyright (c) 2003 Michael Schloh von Bennewitz <[EMAIL PROTECTED]>
-** Copyright (c) 2003 Cable & Wireless <http://www.cw.com/de/>
-**
-** Permission to use, copy, modify, and distribute this software for
-** any purpose with or without fee is hereby granted, provided that
-** the above copyright notice and this permission notice appear in all
-** copies.
-**
-** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-** IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-** USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-** SUCH DAMAGE.
-**
-*/
-
-#ifndef HOND_SETENV_H
-# define HOND_SETENV_H
-int setenv(const char *kszName, const char *kszValue, int nOverwrite);
-#endif /* not HOND_SETENV_H */
+#ifndef LOC_SETENV_H
+# define LOC_SETENV_H
+int setenv(const char *, const char *, int);
+#endif /* not LOC_SETENV_H */
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
