Add msg_queue_exists() function (Benjamin Schulz)

diff --git a/ext/sysvmsg/php_sysvmsg.h b/ext/sysvmsg/php_sysvmsg.h
index 70be76720af409a461f4231f1477a12390f336fb..d98edd4da1720d4c7a08f5a86363c07ca0f6071b 100644 (file)
--- a/ext/sysvmsg/php_sysvmsg.h
+++ b/ext/sysvmsg/php_sysvmsg.h
@@ -48,6 +48,7 @@ PHP_FUNCTION(msg_stat_queue);
 PHP_FUNCTION(msg_set_queue);
 PHP_FUNCTION(msg_send);
 PHP_FUNCTION(msg_receive);
+PHP_FUNCTION(msg_queue_exists);
 
 typedef struct {
        key_t key;

diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index ca7610164144928d056ad2c2030d72e8a079c91c..09b196537f046cda237784f28ed5ff9ce36355d1 100644 (file)
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -73,6 +73,7 @@ const zend_function_entry sysvmsg_functions[] = {
        PHP_FE(msg_remove_queue,                        NULL)
        PHP_FE(msg_stat_queue,                          NULL)
        PHP_FE(msg_set_queue,                           NULL)
+       PHP_FE(msg_queue_exists,                        NULL)
        {NULL, NULL, NULL}      /* Must be the last line in sysvmsg_functions[] */
 };
 /* }}} */
@@ -217,6 +218,24 @@ PHP_FUNCTION(msg_stat_queue)
 }
 /* }}} */
 
+/* {{{ proto bool msg_queue_exists(int key)
+   Check wether a message queue exists */
+PHP_FUNCTION(msg_queue_exists)
+{
+       long key;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &key) == FAILURE)     {
+               return;
+       }
+
+       if (msgget(key, 0) < 0) {
+               RETURN_FALSE;
+       }
+
+       RETURN_TRUE;
+}
+/* }}} */
+
 /* {{{ proto resource msg_get_queue(int key [, int perms]) U
    Attach to a message queue */
 PHP_FUNCTION(msg_get_queue)

diff --git a/ext/sysvmsg/tests/003.phpt b/ext/sysvmsg/tests/003.phpt
new file mode 100644 (file)
index 0000000..66ff046
--- /dev/null
+++ b/ext/sysvmsg/tests/003.phpt
@@ -0,0 +1,25 @@
+--TEST--
+msg_queue_exists()
+--SKIPIF--
+<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extension is not available")?>
+--FILE--
+<?php
+$id = ftok(__FILE__, 'r');
+
+msg_remove_queue(msg_get_queue($id, 0600));
+
+var_dump(msg_queue_exists($id));
+$res = msg_get_queue($id, 0600);
+var_dump($res);
+var_dump(msg_queue_exists($id));
+var_dump(msg_remove_queue($res));
+var_dump(msg_queue_exists($id));
+echo "Done\n";
+?>
+--EXPECTF--
+bool(false)
+resource(%d) of type (sysvmsg queue)
+bool(true)
+bool(true)
+bool(false)
+Done