cli server addressing few todos.

Author: devnexen

sapi/cli/php_cli_server.c

@@ -270,10 +270,10 @@ static bool php_cli_server_get_system_time(char *buf) {
 
 	gettimeofday(&tv, NULL);
 
-	/* TODO: should be checked for NULL tm/return value */
-	php_localtime_r(&tv.tv_sec, &tm);
-	php_asctime_r(&tm, buf);
-	return true;
+	if (!php_localtime_r(&tv.tv_sec, &tm)) {
+		return false;
+	}
+	return php_asctime_r(&tm, buf) != NULL;
 }
 #endif
 
@@ -865,7 +865,6 @@ static int php_cli_server_poller_poll(php_cli_server_poller *poller, struct time
 	return php_select(poller->max_fd + 1, &poller->active.rfds, &poller->active.wfds, NULL, tv);
 } /* }}} */
 
-// TODO Return value is unused, refactor?
 static zend_result php_cli_server_poller_iter_on_active(php_cli_server_poller *poller, void *opaque, zend_result(*callback)(void *, php_socket_t fd, int events)) /* {{{ */
 {
 	zend_result retval = SUCCESS;
@@ -2214,10 +2213,9 @@ static void php_cli_server_request_shutdown(php_cli_server *server, php_cli_serv
 }
 /* }}} */
 
-// TODO Use bool, return value is strange
-static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server_client *client) /* {{{ */
+static zend_result php_cli_server_dispatch_router(php_cli_server *server, php_cli_server_client *client) /* {{{ */
 {
-	int decline = 0;
+	zend_result decline;
 	zend_file_handle zfd;
 	char *old_cwd;
 
@@ -2228,14 +2226,17 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
 
 	zend_stream_init_filename(&zfd, server->router);
 	zfd.primary_script = 1;
+	decline = SUCCESS;
 
 	zend_try {
 		zval retval;
 
 		ZVAL_UNDEF(&retval);
 		if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) {
 			if (Z_TYPE(retval) != IS_UNDEF) {
-				decline = Z_TYPE(retval) == IS_FALSE;
+				if (Z_TYPE(retval) == IS_FALSE) {
+					decline = FAILURE;
+				}
 				zval_ptr_dtor(&retval);
 			}
 		}
@@ -2269,14 +2270,14 @@ static zend_result php_cli_server_dispatch(php_cli_server *server, php_cli_serve
 	if (server->router || !is_static_file) {
 		if (FAILURE == php_cli_server_request_startup(server, client)) {
 			php_cli_server_request_shutdown(server, client);
-			return SUCCESS;
+			return FAILURE;
 		}
 	}
 
 	if (server->router) {
-		if (!php_cli_server_dispatch_router(server, client)) {
+		if (FAILURE == php_cli_server_dispatch_router(server, client)) {
 			php_cli_server_request_shutdown(server, client);
-			return SUCCESS;
+			return FAILURE;
 		}
 	}
 
@@ -2610,8 +2611,7 @@ static zend_result php_cli_server_recv_event_read_request(php_cli_server *server
 				return php_cli_server_send_error_page(server, client, 501);
 			}
 			php_cli_server_poller_remove(&server->poller, POLLIN, client->sock);
-			php_cli_server_dispatch(server, client);
-			return SUCCESS;
+			return php_cli_server_dispatch(server, client);
 		case 0:
 			php_cli_server_poller_add(&server->poller, POLLIN, client->sock);
 			return SUCCESS;
@@ -2657,7 +2657,6 @@ typedef struct php_cli_server_do_event_for_each_fd_callback_params {
 	zend_result(*whandler)(php_cli_server*, php_cli_server_client*);
 } php_cli_server_do_event_for_each_fd_callback_params;
 
-// TODO return FAILURE on failure???
 static zend_result php_cli_server_do_event_for_each_fd_callback(void *_params, php_socket_t fd, int event) /* {{{ */
 {
 	php_cli_server_do_event_for_each_fd_callback_params *params = _params;
@@ -2677,12 +2676,12 @@ static zend_result php_cli_server_do_event_for_each_fd_callback(void *_params, p
 				efree(errstr);
 			}
 			pefree(sa, 1);
-			return SUCCESS;
+			return FAILURE;
 		}
 		if (SUCCESS != php_set_sock_blocking(client_sock, 0)) {
 			pefree(sa, 1);
 			closesocket(client_sock);
-			return SUCCESS;
+			return FAILURE;
 		}
 		client = pemalloc(sizeof(php_cli_server_client), 1);
 
@@ -2717,10 +2716,11 @@ static void php_cli_server_do_event_for_each_fd(php_cli_server *server,
 		whandler
 	};
 
-	php_cli_server_poller_iter_on_active(&server->poller, &params, php_cli_server_do_event_for_each_fd_callback);
+	if (SUCCESS != php_cli_server_poller_iter_on_active(&server->poller, &params, php_cli_server_do_event_for_each_fd_callback)) {
+		php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, "Failed to poll event");
+	}
 } /* }}} */
 
-// TODO Return value of function is not used
 static zend_result php_cli_server_do_event_loop(php_cli_server *server) /* {{{ */
 {
 	zend_result retval = SUCCESS;
@@ -2763,7 +2763,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */
 {
 	char *php_optarg = NULL;
 	int php_optind = 1;
-	int c;
+	int c, r;
 	const char *server_bind_address = NULL;
 	extern const opt_struct OPTIONS[];
 	const char *document_root = NULL;
@@ -2841,6 +2841,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */
 	sapi_module.phpinfo_as_text = 0;
 
 	{
+		r = 0;
 		bool ipv6 = strchr(server.host, ':');
 		php_cli_server_logf(
 			PHP_CLI_SERVER_LOG_PROCESS,
@@ -2859,7 +2860,9 @@ int do_cli_server(int argc, char **argv) /* {{{ */
 
 	zend_signal_init();
 
-	php_cli_server_do_event_loop(&server);
+	if (SUCCESS != php_cli_server_do_event_loop(&server)) {
+		r = 1;
+	}
 	php_cli_server_dtor(&server);
-	return 0;
+	return r;
 } /* }}} */