aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-12-20 21:57:53 +0000
committerRoland McGrath <roland@gnu.org>2005-12-20 21:57:53 +0000
commita25e7e9f7285ee88406e0c11901943999f96a041 (patch)
treeba9628bb33037a39df8f78da6233d4d195bff98c
parent7d9642f06f29ae20264fbba1dc5aff8dd779bbfd (diff)
downloadglibc-a25e7e9f7285ee88406e0c11901943999f96a041.tar
glibc-a25e7e9f7285ee88406e0c11901943999f96a041.tar.gz
glibc-a25e7e9f7285ee88406e0c11901943999f96a041.tar.bz2
glibc-a25e7e9f7285ee88406e0c11901943999f96a041.zip
[BZ #2061]
2005-12-15 Thomas Schwinge <tschwinge@gnu.org> [BZ #2061] * sysdeps/mach/hurd/xmknod.c (__xmknod): Handle S_IFREG.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/mach/hurd/xmknod.c12
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9c8339e4d..45338a1987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-15 Thomas Schwinge <tschwinge@gnu.org>
+
+ [BZ #2061]
+ * sysdeps/mach/hurd/xmknod.c (__xmknod): Handle S_IFREG.
+
2005-12-20 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/ifreq.h: File removed.
diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c
index 2989215d9c..aaa6771cd8 100644
--- a/sysdeps/mach/hurd/xmknod.c
+++ b/sysdeps/mach/hurd/xmknod.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,92,93,94,95,96,99,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1993,1994,1995,1996,1999,2002,2005
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -57,13 +58,18 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev)
translator = _HURD_FIFO;
len = sizeof (_HURD_FIFO);
}
+ else if (S_ISREG (mode))
+ {
+ translator = NULL;
+ len = 0;
+ }
else
{
errno = EINVAL;
return -1;
}
- if (! S_ISFIFO (mode))
+ if (translator != NULL && ! S_ISFIFO (mode))
{
/* We set the translator to "ifmt\0major\0minor\0", where IFMT
depends on the S_IFMT bits of our MODE argument, and MAJOR and
@@ -89,7 +95,7 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev)
/* Create a new, unlinked node in the target directory. */
err = __dir_mkfile (dir, O_WRITE, (mode & ~S_IFMT) & ~_hurd_umask, &node);
- if (! err)
+ if (! err && translator != NULL)
/* Set the node's translator to make it a device. */
err = __file_set_translator (node,
FS_TRANS_EXCL | FS_TRANS_SET,