httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/support htdbm.c
Date Tue, 02 Dec 2003 09:41:45 GMT
jerenkrantz    2003/12/02 01:41:45

  Modified:    support  htdbm.c
  Log:
  If we have a comment, place in a ':' not a ';' (has this *ever* worked?)
  If -n is specified and we have a comment, print the comment out too.
  
  Revision  Changes    Path
  1.11      +10 -3     httpd-2.0/support/htdbm.c
  
  Index: htdbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdbm.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- htdbm.c	3 Feb 2003 17:53:27 -0000	1.10
  +++ htdbm.c	2 Dec 2003 09:41:45 -0000	1.11
  @@ -229,7 +229,7 @@
       if (!htdbm->comment)
           val.dptr  = htdbm->userpass;
       else {
  -        val.dptr = apr_pstrcat(htdbm->pool, htdbm->userpass, ";",
  +        val.dptr = apr_pstrcat(htdbm->pool, htdbm->userpass, ":",
                                  htdbm->comment, NULL);
           val.dsize += (strlen(htdbm->comment) + 1);
       }
  @@ -602,8 +602,15 @@
           fprintf(stdout, "Database %s %s.\n", h->filename, 
                   h->create ? "created" : (changed ? "modified" : "updated"));
       }
  -    if (cmd == HTDBM_NOFILE)
  -        fprintf(stderr, "%s:%s\n", h->username, h->userpass);
  +    if (cmd == HTDBM_NOFILE) {
  +        if (!need_cmnt) {
  +            fprintf(stderr, "%s:%s\n", h->username, h->userpass);
  +        }
  +        else {
  +            fprintf(stderr, "%s:%s:%s\n", h->username, h->userpass,
  +                    h->comment);
  +        }
  +    }
       htdbm_terminate(h);
       apr_terminate();
       
  
  
  

Mime
View raw message