20814N/Adiff -x '*.*~' -x '*.rej' -x '*.orig' -Nrup compizconfig-backend-gconf-0.7.6/configure.ac compizconfig-backend-gconf-0.7.6.modif/configure.ac

20814N/A--- compizconfig-backend-gconf-0.7.6/configure.ac 2008-05-29 14:59:03.000000000 +0200

20814N/A+++ compizconfig-backend-gconf-0.7.6.modif/configure.ac 2008-06-16 15:21:56.365882156 +0200

20814N/A@@ -1,12 +1,12 @@

20814N/A AC_PREREQ(2.57)

20814N/A

20814N/A-AC_INIT([compizconfig-backend-gconf],esyscmd(. ./VERSION;echo -n $VERSION), [maniac@opencompositing.org])

20814N/A+AC_INIT([compizconfig-backend-gconf],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [maniac@opencompositing.org])

20814N/A

20814N/A #AC_CONFIG_AUX_DIR(config)

20814N/A

20814N/A AM_INIT_AUTOMAKE([1.9 dist-bzip2])

20814N/A

20814N/A-#AC_CONFIG_HEADER([config.h])

20814N/A+AC_CONFIG_HEADER([config.h])

20814N/A AM_MAINTAINER_MODE

20814N/A

20814N/A AC_ISC_POSIX

20814N/A@@ -15,6 +15,7 @@ AC_PROG_CPP

20814N/A AC_PROG_LIBTOOL

20814N/A AC_HEADER_STDC

20814N/A AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])

20814N/A+AC_CHECK_FUNCS(va_copy __va_copy vasprintf asprintf strsep)

20814N/A

20814N/A if test "x$GCC" = "xyes"; then

20814N/A case " $CFLAGS " in

20814N/Adiff -x '*.*~' -x '*.rej' -x '*.orig' -Nrup compizconfig-backend-gconf-0.7.6/settings-backend/Makefile.am compizconfig-backend-gconf-0.7.6.modif/settings-backend/Makefile.am

20814N/A--- compizconfig-backend-gconf-0.7.6/settings-backend/Makefile.am 2008-05-29 14:59:03.000000000 +0200

20814N/A+++ compizconfig-backend-gconf-0.7.6.modif/settings-backend/Makefile.am 2008-06-16 15:21:56.367784131 +0200

20814N/A@@ -6,7 +6,7 @@ INCLUDES = @GLIB_CFLAGS@ \

20814N/A

20814N/A libgconf_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)

20814N/A libgconf_la_LIBADD = @CCS_LIBS@ @GCONF_LIBS@ @GLIB_LIBS@

20814N/A-libgconf_la_SOURCES = gconf.c

20814N/A+libgconf_la_SOURCES = gconf.c compat.c

20814N/A backenddir = $(libdir)/compizconfig/backends

20814N/A

20814N/A METASOURCES = AUTO

20814N/Adiff -x '*.*~' -x '*.rej' -x '*.orig' -Nrup compizconfig-backend-gconf-0.7.6/settings-backend/compat.c compizconfig-backend-gconf-0.7.6.modif/settings-backend/compat.c

20814N/A--- compizconfig-backend-gconf-0.7.6/settings-backend/compat.c 1970-01-01 01:00:00.000000000 +0100

20814N/A+++ compizconfig-backend-gconf-0.7.6.modif/settings-backend/compat.c 2008-06-16 15:21:56.366247598 +0200

20814N/A@@ -0,0 +1,131 @@

20814N/A+/*

20814N/A+ * Copyright (c) 2007 Albert Lee <trisk@acm.jhu.edu>.

20814N/A+ *

20814N/A+ * Copyright (c) 2004 Darren Tucker.

20814N/A+ *

20814N/A+ * Based originally on asprintf.c from OpenBSD:

20814N/A+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>

20814N/A+ *

20814N/A+ * Permission to use, copy, modify, and distribute this software for any

20814N/A+ * purpose with or without fee is hereby granted, provided that the above

20814N/A+ * copyright notice and this permission notice appear in all copies.

20814N/A+ *

20814N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

20814N/A+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

20814N/A+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

20814N/A+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

20814N/A+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

20814N/A+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

20814N/A+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

20814N/A+ * OTHER DEALINGS IN THE SOFTWARE.

20814N/A+ */

20814N/A+

20814N/A+#include "config.h"

20814N/A+#include "compat.h"

20814N/A+

20814N/A+#ifndef HAVE_VASPRINTF

20814N/A+#include <errno.h>

20814N/A+#include <stdio.h>

20814N/A+#include <stdarg.h>

20814N/A+#include <stdlib.h>

20814N/A+#include <limits.h>

20814N/A+

20814N/A+#ifndef VA_COPY

20814N/A+# ifdef HAVE_VA_COPY

20814N/A+# define VA_COPY(dest, src) va_copy(dest, src)

20814N/A+# else

20814N/A+# ifdef HAVE___VA_COPY

20814N/A+# define VA_COPY(dest, src) __va_copy(dest, src)

20814N/A+# else

20814N/A+# define VA_COPY(dest, src) (dest) = (src)

20814N/A+# endif

20814N/A+# endif

20814N/A+#endif

20814N/A+

20814N/A+#define INIT_SZ 128

20814N/A+

20814N/A+static int vasprintf(char **str, const char *fmt, va_list ap);

20814N/A+

20814N/A+static int vasprintf(char **str, const char *fmt, va_list ap)

20814N/A+{

20814N/A+ int ret = -1;

20814N/A+ va_list ap2;

20814N/A+ char *string, *newstr;

20814N/A+ size_t len;

20814N/A+

20814N/A+ VA_COPY(ap2, ap);

20814N/A+ if ((string = malloc(INIT_SZ)) == NULL)

20814N/A+ goto fail;

20814N/A+

20814N/A+ ret = vsnprintf(string, INIT_SZ, fmt, ap2);

20814N/A+ if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */

20814N/A+ *str = string;

20814N/A+ } else if (ret == INT_MAX) { /* shouldn't happen */

20814N/A+ goto fail;

20814N/A+ } else { /* bigger than initial, realloc allowing for nul */

20814N/A+ len = (size_t)ret + 1;

20814N/A+ if ((newstr = realloc(string, len)) == NULL) {

20814N/A+ free(string);

20814N/A+ goto fail;

20814N/A+ } else {

20814N/A+ va_end(ap2);

20814N/A+ VA_COPY(ap2, ap);

20814N/A+ ret = vsnprintf(newstr, len, fmt, ap2);

20814N/A+ if (ret >= 0 && (size_t)ret < len) {

20814N/A+ *str = newstr;

20814N/A+ } else { /* failed with realloc'ed string, give up */

20814N/A+ free(newstr);

20814N/A+ goto fail;

20814N/A+ }

20814N/A+ }

20814N/A+ }

20814N/A+ va_end(ap2);

20814N/A+ return (ret);

20814N/A+

20814N/A+fail:

20814N/A+ *str = NULL;

20814N/A+ errno = ENOMEM;

20814N/A+ va_end(ap2);

20814N/A+ return (-1);

20814N/A+}

20814N/A+#endif

20814N/A+

20814N/A+#ifndef HAVE_ASPRINTF

20814N/A+#include <stdio.h>

20814N/A+#include <stdarg.h>

20814N/A+#include <stdlib.h>

20814N/A+

20814N/A+int asprintf(char **str, const char *fmt, ...)

20814N/A+{

20814N/A+ va_list ap;

20814N/A+ int ret;

20814N/A+

20814N/A+ *str = NULL;

20814N/A+ va_start(ap, fmt);

20814N/A+ ret = vasprintf(str, fmt, ap);

20814N/A+ va_end(ap);

20814N/A+

20814N/A+ return ret;

20814N/A+}

20814N/A+#endif

20814N/A+

20814N/A+#ifndef HAVE_STRSEP

20814N/A+#include <string.h>

20814N/A+

20814N/A+char *strsep(char **stringp, const char *delim)

20814N/A+{

20814N/A+ char *s = *stringp;

20814N/A+ char *e;

20814N/A+

20814N/A+ if (!s)

20814N/A+ return NULL;

20814N/A+

20814N/A+ e = strpbrk(s, delim);

20814N/A+ if (e)

20814N/A+ *e++ = '\0';

20814N/A+

20814N/A+ *stringp = e;

20814N/A+ return s;

20814N/A+}

20814N/A+#endif

20814N/A+

20814N/Adiff -x '*.*~' -x '*.rej' -x '*.orig' -Nrup compizconfig-backend-gconf-0.7.6/settings-backend/compat.h compizconfig-backend-gconf-0.7.6.modif/settings-backend/compat.h

20814N/A--- compizconfig-backend-gconf-0.7.6/settings-backend/compat.h 1970-01-01 01:00:00.000000000 +0100

20814N/A+++ compizconfig-backend-gconf-0.7.6.modif/settings-backend/compat.h 2008-06-16 15:21:56.366500278 +0200

20814N/A@@ -0,0 +1,31 @@

20814N/A+/*

20814N/A+ * Copyright (c) 2007 Albert Lee <trisk@acm.jhu.edu>.

20814N/A+ *

20814N/A+ * Copyright (c) 2004 Darren Tucker.

20814N/A+ *

20814N/A+ * Based originally on asprintf.c from OpenBSD:

20814N/A+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>

20814N/A+ *

20814N/A+ * Permission to use, copy, modify, and distribute this software for any

20814N/A+ * purpose with or without fee is hereby granted, provided that the above

20814N/A+ * copyright notice and this permission notice appear in all copies.

20814N/A+ *

20814N/A+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

20814N/A+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

20814N/A+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

20814N/A+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

20814N/A+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

20814N/A+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

20814N/A+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

20814N/A+ * OTHER DEALINGS IN THE SOFTWARE.

20814N/A+ */

20814N/A+

20814N/A+#include "config.h"

20814N/A+

20814N/A+#ifndef HAVE_ASPRINTF

20814N/A+int asprintf(char **str, const char *fmt, ...);

20814N/A+#endif

20814N/A+

20814N/A+#ifndef HAVE_STRSEP

20814N/A+char *strsep(char **stringp, const char *delim);

20814N/A+#endif

20814N/Adiff -x '*.*~' -x '*.rej' -x '*.orig' -Nrup compizconfig-backend-gconf-0.7.6/settings-backend/gconf.c compizconfig-backend-gconf-0.7.6.modif/settings-backend/gconf.c

20814N/A--- compizconfig-backend-gconf-0.7.6/settings-backend/gconf.c 2008-05-29 14:59:03.000000000 +0200

20814N/A+++ compizconfig-backend-gconf-0.7.6.modif/settings-backend/gconf.c 2008-06-16 15:21:56.367512110 +0200

20814N/A@@ -24,6 +24,9 @@

20814N/A *

20814N/A **/

20814N/A

20814N/A+#include "config.h"

20814N/A+#include "compat.h"

20814N/A+

20814N/A #define _GNU_SOURCE

20814N/A #include <stdio.h>

20814N/A #include <stdlib.h>

20814N/A