From 10fe1582b3674a507c48b5e75c86f42073136363 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 3 Jun 2009 23:12:02 +0000 Subject: [PATCH] STABLE14-ptserver-debug-flag-20090603 LICENSE IPL10 FIXES 124893 parse -d (debug) earlier in the ptserver argument parsing, so database switch does not override it. (cherry picked from commit 6124a81e791f54953ea4be3cf3588d9ccf5fb248) --- src/ptserver/ptserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index c3a88c7a7..1a0d3c201 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -279,16 +279,16 @@ main(int argc, char **argv) int alen; lcstring(arg, argv[a], sizeof(arg)); alen = strlen(arg); - if ((strncmp(arg, "-database", alen) == 0) - || (strncmp(arg, "-db", alen) == 0)) { - pr_dbaseName = argv[++a]; /* specify a database */ - } else if (strcmp(argv[a], "-d") == 0) { + if (strcmp(argv[a], "-d") == 0) { if ((a + 1) >= argc) { fprintf(stderr, "missing argument for -d\n"); return -1; } debuglevel = atoi(argv[++a]); LogLevel = debuglevel; + } else if ((strncmp(arg, "-database", alen) == 0) + || (strncmp(arg, "-db", alen) == 0)) { + pr_dbaseName = argv[++a]; /* specify a database */ } else if (strncmp(arg, "-p", alen) == 0) { lwps = atoi(argv[++a]); if (lwps > 16) { /* maximum of 16 */ -- 2.39.5