Patch #569139: Implementation of major, minor and makedev.

Doc/lib/libos.tex

@@ -700,13 +700,32 @@ the client opens it for writing.  Note that \function{mkfifo()}
 doesn't open the FIFO --- it just creates the rendezvous point.
 \end{funcdesc}
 
-\begin{funcdesc}{mknod}{path\optional{, mode=0600, major, minor}}
+\begin{funcdesc}{mknod}{path\optional{, mode=0600, device}}
 Create a filesystem node (file, device special file or named pipe)
-named filename. mode specifies both the permissions to use and the
-type of node to be created, being combined (bitwise OR) with one of
-S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO (those constants are available
-in \module{stat}). For S_IFCHR and S_IFBLK, major and minor define the
-newly created device special file, otherwise they are ignored.
+named filename. \var{mode} specifies both the permissions to use and
+the type of node to be created, being combined (bitwise OR) with one
+of S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO (those constants are
+available in \module{stat}). For S_IFCHR and S_IFBLK, \var{device}
+defines the newly created device special file (probably using
+\function{os.makedev()}), otherwise it is ignored.
+
+\versionadded{2.3}
+\end{funcdesc}
+
+\begin{funcdesc}{major}{device}
+Extracts a device major number from a raw device number.
+
+\versionadded{2.3}
+\end{funcdesc}
+
+\begin{funcdesc}{minor}{device}
+Extracts a device minor number from a raw device number.
+
+\versionadded{2.3}
+\end{funcdesc}
+
+\begin{funcdesc}{makedev}{major, minor}
+Composes a raw device number from the major and minor device numbers.
 
 \versionadded{2.3}
 \end{funcdesc}

Modules/posixmodule.c

@@ -277,9 +277,16 @@ extern int lstat(const char *, struct stat *);
 #	define STRUCT_STAT struct stat
 #endif
 
+#if defined(MAJOR_IN_MKDEV) 
+#include <sys/mkdev.h>
+#else
+#if defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
 #if defined(HAVE_MKNOD) && defined(HAVE_SYS_MKDEV_H)
 #include <sys/mkdev.h>
 #endif
+#endif
 
 /* Return a dictionary corresponding to the POSIX environment table */
 #ifdef WITH_NEXT_FRAMEWORK
@@ -5081,13 +5088,13 @@ posix_mkfifo(PyObject *self, PyObject *args)
 
 #if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
 PyDoc_STRVAR(posix_mknod__doc__,
-"mknod(filename, [, mode=0600, major, minor])\n\n\
+"mknod(filename, [, mode=0600, device])\n\n\
 Create a filesystem node (file, device special file or named pipe)\n\
 named filename. mode specifies both the permissions to use and the\n\
 type of node to be created, being combined (bitwise OR) with one of\n\
 S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO. For S_IFCHR and S_IFBLK,\n\
-major and minor define the newly created device special file, otherwise\n\
-they are ignored.");
+device defines the newly created device special file (probably using\n\
+os.makedev()), otherwise it is ignored.");
 
 
 static PyObject *
@@ -5095,14 +5102,12 @@ posix_mknod(PyObject *self, PyObject *args)
 {
 	char *filename;
 	int mode = 0600;
-	int major = 0;
-	int minor = 0;
+	int device = 0;
 	int res;
-	if (!PyArg_ParseTuple(args, "s|iii:mknod", &filename,
-			      &mode, &major, &minor))
+	if (!PyArg_ParseTuple(args, "s|iii:mknod", &filename, &mode, &device))
 		return NULL;
 	Py_BEGIN_ALLOW_THREADS
-	res = mknod(filename, mode, makedev(major, minor));
+	res = mknod(filename, mode, device);
 	Py_END_ALLOW_THREADS
 	if (res < 0)
 		return posix_error();
@@ -5111,6 +5116,47 @@ posix_mknod(PyObject *self, PyObject *args)
 }
 #endif
 
+#ifdef HAVE_DEVICE_MACROS
+PyDoc_STRVAR(posix_major__doc__,
+"major(device) -> major number\n\
+Extracts a device major number from a raw device number.");
+
+static PyObject *
+posix_major(PyObject *self, PyObject *args)
+{
+	int device;
+	if (!PyArg_ParseTuple(args, "i:major", &device))
+		return NULL;
+	return PyInt_FromLong((long)major(device));
+}
+
+PyDoc_STRVAR(posix_minor__doc__,
+"minor(device) -> minor number\n\
+Extracts a device minor number from a raw device number.");
+
+static PyObject *
+posix_minor(PyObject *self, PyObject *args)
+{
+	int device;
+	if (!PyArg_ParseTuple(args, "i:minor", &device))
+		return NULL;
+	return PyInt_FromLong((long)minor(device));
+}
+
+PyDoc_STRVAR(posix_makedev__doc__,
+"makedev(major, minor) -> device number\n\
+Composes a raw device number from the major and minor device numbers.");
+
+static PyObject *
+posix_makedev(PyObject *self, PyObject *args)
+{
+	int major, minor;
+	if (!PyArg_ParseTuple(args, "ii:makedev", &major, &minor))
+		return NULL;
+	return PyInt_FromLong((long)makedev(major, minor));
+}
+#endif /* device macros */
+
 
 #ifdef HAVE_FTRUNCATE
 PyDoc_STRVAR(posix_ftruncate__doc__,
@@ -6905,6 +6951,11 @@ static PyMethodDef posix_methods[] = {
 #if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
 	{"mknod",	posix_mknod, METH_VARARGS, posix_mknod__doc__},
 #endif
+#ifdef HAVE_DEVICE_MACROS
+	{"major",	posix_major, METH_VARARGS, posix_major__doc__},
+	{"minor",	posix_minor, METH_VARARGS, posix_minor__doc__},
+	{"makedev",	posix_makedev, METH_VARARGS, posix_makedev__doc__},
+#endif
 #ifdef HAVE_FTRUNCATE
 	{"ftruncate",	posix_ftruncate, METH_VARARGS, posix_ftruncate__doc__},
 #endif

configure.in

@@ -621,6 +621,7 @@ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h term.h wctype.h libutil.h \
 sys/resource.h netpacket/packet.h)
 AC_HEADER_DIRENT
+AC_HEADER_MAJOR
 
 # checks for typedefs
 was_it_defined=no
@@ -1716,6 +1717,24 @@ AC_CHECK_FUNCS(gettimeofday,
   )
 )
 
+AC_MSG_CHECKING(for major, minor, and makedev)
+AC_TRY_COMPILE([
+  #if defined(MAJOR_IN_MKDEV)
+  #include <sys/mkdev.h>
+  #elif defined(MAJOR_IN_SYSMACROS)
+  #include <sys/sysmacros.h>
+  #else
+  #include <sys/types.h>
+  #endif
+],[
+  makedev(major(0),minor(0));
+],[
+  AC_DEFINE(HAVE_DEVICE_MACROS, 1,
+	    [Define to 1 if you have the device macros.])
+  AC_MSG_RESULT(yes)
+],[
+  AC_MSG_RESULT(no)
+])
 
 # On OSF/1 V5.1, getaddrinfo is available, but a define
 # for [no]getaddrinfo in netdb.h. 

pyconfig.h.in

@@ -57,6 +57,9 @@
 /* Define to 1 if you have the `ctermid_r' function. */
 #undef HAVE_CTERMID_R
 
+/* Define to 1 if you have the device macros. */
+#undef HAVE_DEVICE_MACROS
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
@@ -604,6 +607,14 @@
 /* Define if you are using Mach cthreads under mach / */
 #undef MACH_C_THREADS
 
+/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
+   */
+#undef MAJOR_IN_MKDEV
+
+/* Define to 1 if `major', `minor', and `makedev' are declared in
+   <sysmacros.h>. */
+#undef MAJOR_IN_SYSMACROS
+
 /* Define if malloc(0) returns a NULL pointer. */
 #undef MALLOC_ZERO_RETURNS_NULL