about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--misc/mntent_r.c6
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 755665d0ec..9bf1c61b28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* misc/mntent_r.c (decode_name): Be compatible with util-linux and
+	recognize \134 as well.
+
 2003-10-09  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/ia64/fpu/fraiseexcpt.c: Don't include <asm/fpu.h>.
@@ -10,9 +15,9 @@
 
 	* sysdeps/unix/sysv/linux/ia64/sys/procfs.h: Don't include
 	<asm/elf.h>.
-	(ELF_NGREG): New.
+	(ELF_NGREG): New #define.
 	(ELF_NFPREG): Likewise.
-	(elf_greg_t): Likewise.
+	(elf_greg_t): New type.
 	(elf_gregset_t): Likewise.
 	(elf_fpreg_t): Likewise.
 	(elf_fpregset_t): Likewise.
@@ -22,7 +27,7 @@
 	* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Include
 	<sys/ucontext.h>.
 	(__ptrace_request): Add PTRACE_GETREGS and PTRACE_SETREGS.
-	(pt_all_user_regs): New.
+	(pt_all_user_regs): New type.
 
 2003-10-10  Simon Josefsson  <jas@extundo.com>
 
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 3a47f61f38..2623ec3b70 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -102,6 +102,12 @@ decode_name (char *buf)
 	*wp++ = '\\';
 	rp += 1;
       }
+    else if (rp[0] == '\\' && rp[1] == '1' && rp[2] == '3' && rp[3] == '4')
+      {
+	/* \134 is also \\.  */
+	*wp++ = '\\';
+	rp += 3;
+      }
     else
       *wp++ = *rp;
   while (*rp++ != '\0');