View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

cmake_cpack_tar_truncate_filepath.patch [^] (907 bytes) 2007-10-09 00:23 [Show Content] [Hide Content]

diff -rpu cmake-2.4.7.orig/Utilities/cmtar/encode.c cmake-2.4.7/Utilities/cmtar/encode.c
--- cmake-2.4.7.orig/Utilities/cmtar/encode.c	2007-10-09 08:08:44.966932253 +0400
+++ cmake-2.4.7/Utilities/cmtar/encode.c	2007-10-09 08:18:25.994689201 +0400
@@ -93,13 +93,13 @@ th_set_path(TAR *t, char *pathname)
   if (pathname[strlen(pathname) - 1] != '/' && TH_ISDIR(t))
     strcpy(suffix, "/");
 
-  if (strlen(pathname) > T_NAMELEN && (t->options & TAR_GNU))
+  if ( (strlen(pathname)+strlen(suffix)) >= T_NAMELEN && (t->options & TAR_GNU))
   {
     /* GNU-style long name */
     t->th_buf.gnu_longname = strdup(pathname);
     strncpy(t->th_buf.name, t->th_buf.gnu_longname, T_NAMELEN);
   }
-  else if (strlen(pathname) > T_NAMELEN)
+  else if ( (strlen(pathname)+strlen(suffix)) >= T_NAMELEN)
   {
     /* POSIX-style prefix field */
     tmp = strchr(&(pathname[strlen(pathname) - T_NAMELEN - 1]), '/');

cmake_cpack_tar_truncate_filepath_posix_fix.patch [^] (1,029 bytes) 2007-10-09 02:41 [Show Content] [Hide Content]

diff -rpu cmake-2.4.7.orig/Utilities/cmtar/encode.c cmake-2.4.7/Utilities/cmtar/encode.c
--- cmake-2.4.7.orig/Utilities/cmtar/encode.c	2007-10-09 08:08:44.966932253 +0400
+++ cmake-2.4.7/Utilities/cmtar/encode.c	2007-10-09 10:35:02.297473750 +0400
@@ -93,16 +93,16 @@ th_set_path(TAR *t, char *pathname)
   if (pathname[strlen(pathname) - 1] != '/' && TH_ISDIR(t))
     strcpy(suffix, "/");
 
-  if (strlen(pathname) > T_NAMELEN && (t->options & TAR_GNU))
+  if ( (strlen(pathname)+strlen(suffix)) >= T_NAMELEN && (t->options & TAR_GNU))
   {
     /* GNU-style long name */
     t->th_buf.gnu_longname = strdup(pathname);
     strncpy(t->th_buf.name, t->th_buf.gnu_longname, T_NAMELEN);
   }
-  else if (strlen(pathname) > T_NAMELEN)
+  else if ( (strlen(pathname)+strlen(suffix)) >= T_NAMELEN)
   {
     /* POSIX-style prefix field */
-    tmp = strchr(&(pathname[strlen(pathname) - T_NAMELEN - 1]), '/');
+    tmp = strrchr(pathname, '/');
     if (tmp == NULL)
     {
       printf("!!! '/' not found in \"%s\"\n", pathname);

Relationships

Notes
(0009403) Ihalainen Nickolay (reporter) 2007-10-09 02:40	Sorry, POSIX tar implementation has more problems.

(0009966) Bill Hoffman (manager) 2007-12-17 17:51	$ cvs commit -m "BUG: fix for bug 5837, libtar and long path names" cvs commit: Examining . cvs commit: Examining compat cvs commit: Examining listhash /cvsroot/CMake/CMake/Utilities/cmtar/encode.c,v <-- encode.c new revision: 1.5; previous revision: 1.4

Issue History
Date Modified	Username	Field	Change
2007-10-09 00:23	Ihalainen Nickolay	New Issue
2007-10-09 00:23	Ihalainen Nickolay	File Added: cmake_cpack_tar_truncate_filepath.patch
2007-10-09 02:40	Ihalainen Nickolay	Note Added: 0009403
2007-10-09 02:41	Ihalainen Nickolay	File Added: cmake_cpack_tar_truncate_filepath_posix_fix.patch
2007-12-17 17:51	Bill Hoffman	Note Added: 0009966
2007-12-17 17:51	Bill Hoffman	Status	new => closed
2007-12-17 17:51	Bill Hoffman	Resolution	open => fixed