[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: OpenVMS and CVS-1_11_21 client
|
From: |
Mark D. Baushke |
|
Subject: |
Re: OpenVMS and CVS-1_11_21 client |
|
Date: |
Wed, 09 Nov 2005 03:02:52 -0800 |
Hi Piet,
Thank you for your report.
1) It is not clear to me that you should not define the FOLD_FN_CHAR()
macro inside of lib/system.h near where the MACOS version is defined.
I have revised your patch to do this.
2) I would rather not make the style change for the getopt.c getopt
definition without knowing more. I believe we may still have some
hosts out there that do not like ANSI-style definitions... do you
have any further clues about why this change is needed to get your
compiler to work properly?
3) The [src]client.c change is no longer needed as handle_m() no longer
plays games in the same was as the 1.11.21 release. The same is true
of the handle_e() function.
4) The [src]recurse.c lines:
assert (!"Not reached. Please report this problem to <"
PACKAGE_BUGREPORT ">");
are intended to do ANSI C string concatenation with the PACKAGE_BUGREPORT
macro. This was apparently missing from [vms]config.h, so I have added it.
5) I guessed at ChangeLog entries for your changes. If you have better
descriptions, let me know and I will revise them.
I have installed a modified patch into the latest cvs1-11-x-branch as
well as on the main trunk (the FEATURE branch) code.
You may wish to checkout a snapshot from the
savannah.nongnu.org:/cvsroot/cvs
cvs -z3 -d :ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs \
checkout -rcvs1-11-x-branch ccvs
to see if things work better for you than previously. You may also
wish to see if there is any hope of building a cvs 1.12.x release
cvs -z3 -d :ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs \
checkout ccvs
and let us know how it goes.
Thanks,
-- Mark
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.169.2.35
diff -u -p -r1.169.2.35 ChangeLog
--- lib/ChangeLog 11 Jul 2005 16:03:34 -0000 1.169.2.35
+++ lib/ChangeLog 9 Nov 2005 10:46:17 -0000
@@ -1,3 +1,8 @@
+2005-11-09 Mark D. Baushke <mdb@gnu.org>
+
+ * system.h (FOLD_FN_CHAR): Create a VMS alternative of this macro
+ (patch suggested by Piet Schuermans <pschuermans@mac.com>).
+
2005-07-11 Mark D. Baushke <mdb@cvshome.org>
* getpass.c (getpass): Add a K&R style function definition.
Index: lib/system.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/system.h,v
retrieving revision 1.43.4.10
diff -u -p -r1.43.4.10 system.h
--- lib/system.h 9 Feb 2005 04:45:31 -0000 1.43.4.10
+++ lib/system.h 9 Nov 2005 10:46:17 -0000
@@ -500,8 +500,13 @@ extern unsigned char WNT_filename_classe
* WOE32 needs its own class since \ and C:\ style absolute paths also need
* to be accounted for.
*/
+# if defined(MACOS) || defined(TARGET_OS_MAC)
# define FOLD_FN_CHAR(c) (OSX_filename_classes[(unsigned char) (c)])
extern unsigned char OSX_filename_classes[];
+# else
+# define FOLD_FN_CHAR(c) (VMS_filename_classes[(unsigned char) (c)])
+extern unsigned char VMS_filename_classes[];
+# endif
# endif /* __CYGWIN32__ || WOE32 */
/* The following need to be declared for all case insensitive filesystems.
Index: vms/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/ChangeLog,v
retrieving revision 1.76.4.12
diff -u -p -r1.76.4.12 ChangeLog
--- vms/ChangeLog 5 Sep 2005 01:31:58 -0000 1.76.4.12
+++ vms/ChangeLog 9 Nov 2005 10:46:17 -0000
@@ -1,3 +1,13 @@
+2005-11-09 Mark D. Baushke <mdb@gnu.org>
+
+ * filesubr.c (VMS_filename_classes): New table data.
+ * filesubr.c (last_component): Returns const char * everywhere.
+ * vms.h (link): both args should be const char *.
+ (Patch suggested by Piet Schuermans <pschuermans@mac.com>).
+
+ * config.h.in (PACKAGE_BUGREPORT): Add missing macro.
+ * config.h: Regenerated.
+
2005-09-04 Derek Price <derek@ximbiot.com>
* Makefile.am (EXTRA_DIST): Add .cvsignore.
Index: vms/config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/config.h,v
retrieving revision 1.25.4.7
diff -u -p -r1.25.4.7 config.h
--- vms/config.h 28 Sep 2005 04:52:10 -0000 1.25.4.7
+++ vms/config.h 9 Nov 2005 10:46:17 -0000
@@ -9,6 +9,7 @@
June 1995 - <benjamin@cyclic.com> */
/* The following macro are defined by running ./configure under UNIX OSs. */
+#define PACKAGE_BUGREPORT "bug-cvs@nongnu.org"
#define PACKAGE_STRING "Concurrent Versions System (CVS) 1.11.21.1"
/* We only want to build the client */
Index: vms/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/config.h.in,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 config.h.in
--- vms/config.h.in 9 Feb 2005 04:49:47 -0000 1.1.2.1
+++ vms/config.h.in 9 Nov 2005 10:46:17 -0000
@@ -2,6 +2,7 @@
June 1995 - <benjamin@cyclic.com> */
/* The following macro are defined by running ./configure under UNIX OSs. */
+#define PACKAGE_BUGREPORT "bug-cvs@nongnu.org"
#define PACKAGE_STRING "Concurrent Versions System (CVS) %PACKAGE_VERSION%"
/* We only want to build the client */
Index: vms/filesubr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/filesubr.c,v
retrieving revision 1.16.4.3
diff -u -p -r1.16.4.3 filesubr.c
--- vms/filesubr.c 9 Feb 2005 04:49:47 -0000 1.16.4.3
+++ vms/filesubr.c 9 Nov 2005 10:46:17 -0000
@@ -656,6 +656,43 @@ xcmp (file1_file, file2_file)
return (ret);
}
+unsigned char
+VMS_filename_classes[] =
+{
+ 0x00,0x01,0x02,0x03, 0x04,0x05,0x06,0x07,
+ 0x08,0x09,0x0a,0x0b, 0x0c,0x0d,0x0e,0x0f,
+ 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17,
+ 0x18,0x19,0x1a,0x1b, 0x1c,0x1d,0x1e,0x1f,
+ 0x20,0x21,0x22,0x23, 0x24,0x25,0x26,0x27,
+ 0x28,0x29,0x2a,0x2b, 0x2c,0x2d,0x2e,0x2f,
+ 0x30,0x31,0x32,0x33, 0x34,0x35,0x36,0x37,
+ 0x38,0x39,0x3a,0x3b, 0x3c,0x3d,0x3e,0x3f,
+ 0x40,0x61,0x62,0x63, 0x64,0x65,0x66,0x67,
+ 0x68,0x69,0x6a,0x6b, 0x6c,0x6d,0x6e,0x6f,
+ 0x70,0x71,0x72,0x73, 0x74,0x75,0x76,0x77,
+ 0x78,0x79,0x7a,0x5b, 0x5c,0x5d,0x5e,0x5f,
+ 0x60,0x61,0x62,0x63, 0x64,0x65,0x66,0x67,
+ 0x68,0x69,0x6a,0x6b, 0x6c,0x6d,0x6e,0x6f,
+ 0x70,0x71,0x72,0x73, 0x74,0x75,0x76,0x77,
+ 0x78,0x79,0x7a,0x7b, 0x7c,0x7d,0x7e,0x7f,
+ 0x80,0x81,0x82,0x83, 0x84,0x85,0x86,0x87,
+ 0x88,0x89,0x8a,0x8b, 0x8c,0x8d,0x8e,0x8f,
+ 0x90,0x91,0x92,0x93, 0x94,0x95,0x96,0x97,
+ 0x98,0x99,0x9a,0x9b, 0x9c,0x9d,0x9e,0x9f,
+ 0xa0,0xa1,0xa2,0xa3, 0xa4,0xa5,0xa6,0xa7,
+ 0xa8,0xa9,0xaa,0xab, 0xac,0xad,0xae,0xaf,
+ 0xb0,0xb1,0xb2,0xb3, 0xb4,0xb5,0xb6,0xb7,
+ 0xb8,0xb9,0xba,0xbb, 0xbc,0xbd,0xbe,0xbf,
+ 0xc0,0xc1,0xc2,0xc3, 0xc4,0xc5,0xc6,0xc7,
+ 0xc8,0xc9,0xca,0xcb, 0xcc,0xcd,0xce,0xcf,
+ 0xd0,0xd1,0xd2,0xd3, 0xd4,0xd5,0xd6,0xd7,
+ 0xd8,0xd9,0xda,0xdb, 0xdc,0xdd,0xde,0xdf,
+ 0xe0,0xe1,0xe2,0xe3, 0xe4,0xe5,0xe6,0xe7,
+ 0xe8,0xe9,0xea,0xeb, 0xec,0xed,0xee,0xef,
+ 0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,0xf7,
+ 0xf8,0xf9,0xfa,0xfb, 0xfc,0xfd,0xfe,0xff,
+};
+
/* Like strcmp, but with the appropriate tweaks for file names.
@@ -902,7 +939,7 @@ xresolvepath ( path )
}
/* Return a pointer into PATH's last component. */
-char *
+const char *
last_component (path)
char *path;
{
Index: vms/vms.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/vms.h,v
retrieving revision 1.6
diff -u -p -r1.6 vms.h
--- vms/vms.h 10 Jan 2001 18:59:27 -0000 1.6
+++ vms/vms.h 9 Nov 2005 10:46:17 -0000
@@ -37,7 +37,7 @@ int vms_unlink(char *path);
#else
int vms_unlink(char const*path);
#endif
-int link(char *from, char *to);
+int link(const char *from, const char *to);
#define stat(a, b) wrapped_stat(a, b)
#define lstat stat