ext/posix: adding posix_mkfifoat/posix_mknodat.

The additional directory file descriptor argument allows to operate
from a relative path perspective but those new calls can still
work with absolute paths.

Author: devnexen

ext/posix/config.m4

@@ -8,7 +8,7 @@ if test "$PHP_POSIX" = "yes"; then
   AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions])
   PHP_NEW_EXTENSION(posix, posix.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
-  AC_CHECK_FUNCS(seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups initgroups getgrgid_r eaccess)
+  AC_CHECK_FUNCS(seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups initgroups getgrgid_r eaccess mkfifoat mknodat)
 
   dnl Check for makedev. If it's defined as a macro, AC_CHECK_FUNCS won't work.
   dnl Required headers are included by the AC_HEADER_MAJOR logic.

ext/posix/posix.c

@@ -1303,3 +1303,101 @@ PHP_FUNCTION(posix_fpathconf)
 	RETURN_LONG(ret);
 }
 #endif
+
+#ifdef HAVE_MKFIFOAT
+PHP_FUNCTION(posix_mkfifoat)
+{
+	zend_string *path;
+	zend_long mode, fd = 0;
+	zval *z_fd;
+	int result;
+
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+		Z_PARAM_ZVAL(z_fd)
+		Z_PARAM_PATH_STR(path)
+		Z_PARAM_LONG(mode)
+	ZEND_PARSE_PARAMETERS_END();
+
+	if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
+		if (!php_posix_stream_get_fd(z_fd, &fd)) {
+			RETURN_FALSE;
+		}
+	} else {
+		if (!zend_parse_arg_long(z_fd, &fd, /* is_null */ NULL, /* check_null */ false, /* arg_num */ 1)) {
+			zend_argument_type_error(1, "must be of type int|resource, %s given",
+				zend_zval_value_name(z_fd));
+			RETURN_THROWS();
+		}
+	}
+
+	if (php_check_open_basedir_ex(ZSTR_VAL(path), 0)) {
+		RETURN_FALSE;
+	}
+
+	result = mkfifoat(fd, ZSTR_VAL(path), mode);
+	if (result < 0) {
+		POSIX_G(last_error) = errno;
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+#endif
+
+#ifdef HAVE_MKNODAT
+PHP_FUNCTION(posix_mknodat)
+{
+	zend_string *path;
+	zend_long mode, fd = 0;
+	zend_long major = 0, minor = 0;
+	zval *z_fd;
+	int result;
+	dev_t php_dev = 0;
+
+	ZEND_PARSE_PARAMETERS_START(3, 5)
+		Z_PARAM_ZVAL(z_fd)
+		Z_PARAM_PATH_STR(path)
+		Z_PARAM_LONG(mode)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_LONG(major)
+		Z_PARAM_LONG(minor)
+	ZEND_PARSE_PARAMETERS_END();
+
+	if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
+		if (!php_posix_stream_get_fd(z_fd, &fd)) {
+			RETURN_FALSE;
+		}
+	} else {
+		if (!zend_parse_arg_long(z_fd, &fd, /* is_null */ NULL, /* check_null */ false, /* arg_num */ 1)) {
+			zend_argument_type_error(1, "must be of type int|resource, %s given",
+				zend_zval_value_name(z_fd));
+			RETURN_THROWS();
+		}
+	}
+
+	if (php_check_open_basedir_ex(ZSTR_VAL(path), 0)) {
+		RETURN_FALSE;
+	}
+
+	if ((mode & S_IFCHR) || (mode & S_IFBLK)) {
+		if (major == 0) {
+			zend_argument_value_error(4, "cannot be 0 for the POSIX_S_IFCHR and POSIX_S_IFBLK modes");
+			RETURN_THROWS();
+		} else {
+#ifdef HAVE_MAKEDEV
+			php_dev = makedev(major, minor);
+#else
+			zend_value_error("Cannot create a block or character device, creating a normal file instead");
+#endif
+		}
+	}
+
+	result = mknodat(fd, ZSTR_VAL(path), mode, php_dev);
+	if (result < 0) {
+		POSIX_G(last_error) = errno;
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+#endif

ext/posix/posix.stub.php

@@ -454,3 +454,13 @@ function posix_pathconf(string $path, int $name): int|false {}
 /** @param resource|int $file_descriptor */
 function posix_fpathconf($file_descriptor, int $name): int|false {}
 #endif
+
+#ifdef HAVE_MKFIFOAT
+/** @param resource|int $file_descriptor */
+function posix_mkfifoat($file_descriptor, string $path, int $permissions): bool {}
+#endif
+
+#ifdef HAVE_MKNODAT
+/** @param resource|int $file_descriptor */
+function posix_mknodat($file_descriptor, string $path, int $flags, int $major = 0, int $minor = 0): bool {}
+#endif

ext/posix/posix_arginfo.h

@@ -0,0 +1,35 @@
+--TEST--
+posix_mknodat/posix_mkfifoat support
+--EXTENSIONS--
+posix
+--SKIPIF--
+<?php
+if (!function_exists('posix_mknodat')) die('skip posix_mknodat() not found');
+?>
+--FILE--
+<?php
+
+$fd = fopen(__DIR__, "r");
+var_dump(posix_mknodat($fd, '', POSIX_S_IFBLK | 0777, 1, 0));
+var_dump(posix_mknodat($fd, __DIR__ . '', POSIX_S_IFBLK | 0777, 1, 0));
+try {
+	posix_mknodat($fd, __DIR__ . '/dev/', POSIX_S_IFBLK | 0777, 0, 0);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+var_dump(posix_mkfifoat($fd, '', POSIX_S_IFBLK | 0777));
+var_dump(posix_mkfifoat($fd, __DIR__ . '', POSIX_S_IFBLK | 0777));
+try {
+	posix_mkfifoat(new stdClass(), '/dev/', POSIX_S_IFBLK | 0777);
+} catch (TypeError $e) {
+	echo $e->getMessage();
+}
+fclose($fd);
+?>
+--EXPECT--
+bool(false)
+bool(false)
+posix_mknodat(): Argument #4 ($major) cannot be 0 for the POSIX_S_IFCHR and POSIX_S_IFBLK modes
+bool(false)
+bool(false)
+posix_mkfifoat(): Argument #1 ($file_descriptor) must be of type int|resource, stdClass given