diff options
Diffstat (limited to 'databases/pgpool-II/files/patch-pcp_systemdb_info.c')
-rw-r--r-- | databases/pgpool-II/files/patch-pcp_systemdb_info.c | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/databases/pgpool-II/files/patch-pcp_systemdb_info.c b/databases/pgpool-II/files/patch-pcp_systemdb_info.c deleted file mode 100644 index 4cd3094b4288..000000000000 --- a/databases/pgpool-II/files/patch-pcp_systemdb_info.c +++ /dev/null @@ -1,109 +0,0 @@ -Index: pcp/pcp_systemdb_info.c -=================================================================== -RCS file: /cvsroot/pgpool/pgpool-II/pcp/pcp_systemdb_info.c,v -retrieving revision 1.2 -diff -u -r1.2 pcp_systemdb_info.c ---- pcp/pcp_systemdb_info.c 29 Jan 2008 01:56:38 -0000 1.2 -+++ pcp/pcp_systemdb_info.c 29 Dec 2008 05:15:44 -0000 -@@ -23,6 +23,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <unistd.h> - - #include "pcp.h" - -@@ -39,36 +40,47 @@ - char pass[MAX_USER_PASSWD_LEN]; - SystemDBInfo *systemdb_info; - int i, j; -+ int ch; - -- if (argc == 2 && (strcmp(argv[1], "-h") == 0) ) -- { -- usage(); -- exit(0); -+ while ((ch = getopt(argc, argv, "hd")) != -1) { -+ switch (ch) { -+ case 'd': -+ pcp_enable_debug(); -+ break; -+ -+ case 'h': -+ case '?': -+ default: -+ usage(); -+ exit(0); -+ } - } -+ argc -= optind; -+ argv += optind; - -- if (argc != 6) -+ if (argc != 5) - { - errorcode = INVALERR; - pcp_errorstr(errorcode); - myexit(errorcode); - } - -- timeout = atol(argv[1]); -+ timeout = atol(argv[0]); - if (timeout < 0) { - errorcode = INVALERR; - pcp_errorstr(errorcode); - myexit(errorcode); - } - -- if (strlen(argv[2]) >= MAX_DB_HOST_NAMELEN) -+ if (strlen(argv[1]) >= MAX_DB_HOST_NAMELEN) - { - errorcode = INVALERR; - pcp_errorstr(errorcode); - myexit(errorcode); - } -- strcpy(host, argv[2]); -+ strcpy(host, argv[1]); - -- port = atoi(argv[3]); -+ port = atoi(argv[2]); - if (port <= 1024 || port > 65535) - { - errorcode = INVALERR; -@@ -76,21 +88,21 @@ - myexit(errorcode); - } - -- if (strlen(argv[4]) >= MAX_USER_PASSWD_LEN) -+ if (strlen(argv[3]) >= MAX_USER_PASSWD_LEN) - { - errorcode = INVALERR; - pcp_errorstr(errorcode); - myexit(errorcode); - } -- strcpy(user, argv[4]); -+ strcpy(user, argv[3]); - -- if (strlen(argv[5]) >= MAX_USER_PASSWD_LEN) -+ if (strlen(argv[4]) >= MAX_USER_PASSWD_LEN) - { - errorcode = INVALERR; - pcp_errorstr(errorcode); - myexit(errorcode); - } -- strcpy(pass, argv[5]); -+ strcpy(pass, argv[4]); - - if (pcp_connect(host, port, user, pass)) - { -@@ -146,8 +158,9 @@ - usage(void) - { - fprintf(stderr, "pcp_systemdb_info - display the pgpool-II systemDB information\n\n"); -- fprintf(stderr, "Usage: pcp_systemdb_info timeout hostname port# username password\n"); -+ fprintf(stderr, "Usage: pcp_systemdb_info [-d] timeout hostname port# username password\n"); - fprintf(stderr, "Usage: pcp_systemdb_info -h\n\n"); -+ fprintf(stderr, " -d - enable debug message (optional)\n"); - fprintf(stderr, " timeout - connection timeout value in seconds. command exits on timeout\n"); - fprintf(stderr, " hostname - pgpool-II hostname\n"); - fprintf(stderr, " port# - pgpool-II port number\n"); |