Fix Sed scripts and msdos.c as fallout of latest changes.

3 files changed, 20 insertions, 6 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 78588b80a0d..45666a335de 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
+        editing out.
+
+        * sed2v2.inp (IS_DEVICE_SEP): Edit to match ':'.
+        (IS_DIRECTORY_SEP, INTERNAL_TERMINAL): Fix Sed command syntax.
+        (MSDOS): Define only if undefined, as MSDOS is a built-in macro,
+        unless some std= switch to GCC is used.
+
 2012-08-01  Glenn Morris  <rgm@gnu.org>
 
         * sed2v2.inp (HAVE_WCHAR_H): Fix typo.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ad2896ef56b..ae0db1339c9 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -26,7 +26,10 @@
 #define NSIG 320\
 #endif
 
-/^#undef MSDOS *$/s/^.*$/#define MSDOS/
+/^#undef MSDOS *$/c\
+#ifndef MSDOS\
+#define MSDOS\
+#endif
 /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
 /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
 /^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/
@@ -85,11 +88,12 @@
 /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/
 /^#undef HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/
 /^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/
-/^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')/
+/^#undef IS_DIRECTORY_SEP *$/s,^.*$,#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\'),
+/^#undef IS_DEVICE_SEP *$/s/^.*$/#define IS_DEVICE_SEP(_c_) ((_c_) == ':')/
 /^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))/
-/^#undef INTERNAL_TERMINAL *$/s/^.*$/#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display::co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>::se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>::AB=<BG %d>:AF=<FG %d>:op=<DefC>:"/
+/^#undef INTERNAL_TERMINAL *$/s,^.*$,#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display::co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>::se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>::AB=<BG %d>:AF=<FG %d>:op=<DefC>:",
 /^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/
-/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR ';'/
+/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR '\;'/
 /^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/
 /^#undef _setjmp/s/^.*$/#define _setjmp setjmp/
 /^#undef _longjmp/s/^.*$/#define _longjmp longjmp/
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index b5b66753bb3..67719cffbd4 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -605,10 +605,10 @@ am__cd = cd
   s| *sys/select\.h||
   s| *sys/time\.h||
 }
-/^am_libgnu_a_OBJECTS *=/,/^[   ]/{
+/^am_libgnu_a_OBJECTS *=/,/^[^  ]/{
+  s/allocator\.\$(OBJEXT) //
   s/careadlinkat\.\$(OBJEXT) //
 }
-/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
 /^srcdir *=/s/@[^@\n]*@/./
 /^top_srcdir *=/s/@[^@\n]*@/../
 /^top_builddir *=/s/@[^@\n]*@/../