- updated

Changed files:
    cvs-fixed_buffer.patch -> 1.2
    cvs-home_etc.patch -> 1.6

diff --git a/cvs-fixed_buffer.patch b/cvs-fixed_buffer.patch
index 7ef63da04d8f086cf21ad05e8f911f047dd024f4..8b8118f3d9000c197986526b9ac2a2c3b1f79d8a 100644 (file)
--- a/cvs-fixed_buffer.patch
+++ b/cvs-fixed_buffer.patch
@@ -1,14 +1,17 @@
+--- cvs/src/buffer.h.org       2007-11-05 20:50:00.611456571 +0100
++++ cvs/src/buffer.h   2007-11-05 20:50:11.485304127 +0100
+@@ -16,6 +16,8 @@
+ 
+ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+ 
++# include <unistd.h>
++
+ # include "getpagesize.h"
+ 
+ /*
 diff -ur cvs-1.11.1p1.orig/src/buffer.c cvs-1.11.1p1/src/buffer.c
 --- cvs-1.11.1p1.orig/src/buffer.c     Thu Apr 19 21:29:05 2001
 +++ cvs-1.11.1p1/src/buffer.c  Thu Feb 14 13:22:23 2002
-@@ -1,6 +1,7 @@
- /* Code for the buffer data structure.  */
- 
- #include <assert.h>
-+#include <unistd.h>
- #include "cvs.h"
- #include "buffer.h"
- 
 @@ -292,15 +293,28 @@
  
            if (nbytes != data->size)

diff --git a/cvs-home_etc.patch b/cvs-home_etc.patch
index 4c71f7c69984e8c4b3bb10ff116421e7e3004c58..531a10bfcfc97db813ba382fffcbddb312d6e8b4 100644 (file)
--- a/cvs-home_etc.patch
+++ b/cvs-home_etc.patch
@@ -1,37 +1,29 @@
---- cvs-1.11.4/src/filesubr.c.orig     Tue Sep 24 22:47:09 2002
-+++ cvs-1.11.4/src/filesubr.c  Fri Jan 17 20:59:20 2003
-@@ -18,6 +18,7 @@
-    file system semantics.  */
- 
- #include <assert.h>
-+#include <sys/stat.h>
- #include "cvs.h"
- 
- static int deep_remove_dir PROTO((const char *path));
-@@ -969,8 +970,24 @@
-     const char *dir;
-     const char *file;
+diff -urN cvs-1.12.13.org/src/filesubr.c cvs-1.12.13/src/filesubr.c
+--- cvs-1.12.13.org/src/filesubr.c     2005-09-28 17:25:59.000000000 +0200
++++ cvs-1.12.13/src/filesubr.c 2007-11-05 20:47:46.928468198 +0100
+@@ -832,7 +832,24 @@
+ char *
+ strcat_filename_onto_homedir (const char *dir, const char *file)
  {
--    char *path = xmalloc (strlen (dir) + 1 + strlen(file) + 1);
--    sprintf (path, "%s/%s", dir, file);
+-    char *path = Xasprintf ("%s/%s", dir, file);
++    char *path;
 +    char *path,*cfgdir;
 +    struct stat st;
 +    int isdot = (*file == '.');
 +
 +    if ( (path = getenv("CONFIG_DIR")) && path[0] ) {
-+      cfgdir = xmalloc(strlen(dir) + 1 + strlen(path) + 1);
-+      sprintf(cfgdir, "%s/%s", dir, path);
++          cfgdir = xmalloc(strlen(dir) + 1 + strlen(path) + 1);
++          sprintf(cfgdir, "%s/%s", dir, path);
 +    } else
-+      cfgdir = NULL;
++          cfgdir = NULL;
 +    if ( cfgdir && (stat(cfgdir, &st) != -1) && S_ISDIR(st.st_mode) ) {
-+      path = xmalloc(strlen(cfgdir) + 1 + strlen(file)-isdot + 1);
-+      sprintf (path, "%s/%s", cfgdir, file+isdot);
++          path = Xasprintf ("%s/%s", cfgdir, file+isdot);
 +    } else {
-+        path = xmalloc (strlen (dir) + 1 + strlen(file) + 1);
-+      sprintf (path, "%s/%s", dir, file);
++          path = Xasprintf ("%s/%s", dir, file);
 +    }
 +    if (cfgdir)
-+      free(cfgdir);
++          free(cfgdir);
++   
      return path;
  }