apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/test testnames.c Makefile.in MakeWin32Make.pl
Date Sun, 08 Apr 2001 08:08:20 GMT
wrowe       01/04/08 01:08:20

  Modified:    test     Makefile.in MakeWin32Make.pl
  Added:       test     testnames.c
  Log:
    Add my testbench that demonstrates apr_filepath_merge.  This would be
    better written to handle and compare a list of demonstration cases to
    the expected results, but I've no time for it this weekend
  
  Revision  Changes    Path
  1.46      +4 -0      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Makefile.in	2001/03/28 21:33:43	1.45
  +++ Makefile.in	2001/04/08 08:08:19	1.46
  @@ -4,6 +4,7 @@
   	sendfile@EXEEXT@ \
   	server@EXEEXT@ \
   	testfile@EXEEXT@ \
  +	testnames@EXEEXT@ \
   	testflock@EXEEXT@ \
   	testproc@EXEEXT@ \
   	testsock@EXEEXT@ \
  @@ -41,6 +42,9 @@
   
   testfile@EXEEXT@: testfile.lo ../libapr.la
   	$(LINK) testfile.lo $(ALL_LIBS)
  +
  +testnames@EXEEXT@: testnames.lo ../libapr.la
  +	$(LINK) testnames.lo $(ALL_LIBS)
   
   testflock@EXEEXT@: testflock.lo ../libapr.la
   	$(LINK) testflock.lo $(ALL_LIBS)
  
  
  
  1.9       +1 -1      apr/test/MakeWin32Make.pl
  
  Index: MakeWin32Make.pl
  ===================================================================
  RCS file: /home/cvs/apr/test/MakeWin32Make.pl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MakeWin32Make.pl	2001/04/03 06:00:54	1.8
  +++ MakeWin32Make.pl	2001/04/08 08:08:19	1.9
  @@ -15,7 +15,7 @@
       if ($t =~ m|^ALL_LIBS=|) {
           $t = "ALL_LIBS=../LibD/apr.lib kernel32\.lib user32\.lib advapi32\.lib ws2_32\.lib
wsock32\.lib ole32\.lib";
       }
  -    if ($t =~ s|\@CFLAGS\@|\/nologo \/MDd \/W3 \/Gm \/GX \/Zi \/Od \/D "_DEBUG" \/D "WIN32"
\/D APR_DECLARE_STATIC \/FD|) {
  +    if ($t =~ s|\@CFLAGS\@|\/nologo \/c \/MDd \/W3 \/Gm \/GX \/Zi \/Od \/D "_DEBUG" \/D
"WIN32" \/D APR_DECLARE_STATIC \/FD|) {
           $t =~ s|-g ||;
       }
       $t =~ s|\$\{LD_FLAGS\}||;
  
  
  
  1.1                  apr/test/testnames.c
  
  Index: testnames.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include "apr_file_io.h"
  #include "apr_file_info.h"
  #include "apr_errno.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_lib.h"
  
  apr_pool_t *context;
  
  static void closeapr(void)
  {
      apr_pool_destroy(context);
      apr_terminate();
  }
  
  static void mergeresult(char *rootpath, char *addpath, apr_int32_t mergetype, char *tdesc)
  {
      char errmsg[256];
      char *dstpath = NULL;
      char *srcpath;
      apr_status_t status = apr_filepath_merge(&dstpath, 
                                  strcmp(rootpath, "NULL") ? rootpath : NULL,
                                  strcmp(addpath, "NULL") ? addpath : NULL,
                                  mergetype, context);
      apr_strerror(status, errmsg, sizeof(errmsg));
      if (dstpath) {
          fprintf(stderr, "%s result for %s\n\tResult Path \"%s\"\n", errmsg, tdesc, dstpath);
          srcpath = dstpath;
          status = apr_filepath_root(&dstpath, &srcpath, context);
          if (srcpath != dstpath) {
              apr_strerror(status, errmsg, sizeof(errmsg));
              fprintf(stderr, "\tRoot of \"%s\" (%s)\n", dstpath, errmsg);
          }
      }
      else {
          fprintf(stderr, "%s result for %s\n", errmsg, tdesc, dstpath);
      }
  }
  
  #define merge_result(r, a, t) mergeresult(r, a, t, #t)
  
  int main(void)
  {
      char rootpath[256];
      char addpath[256];
  
      if (apr_initialize() != APR_SUCCESS) {
          fprintf(stderr, "Couldn't initialize.");
          exit(-1);
      }
      atexit(closeapr);
      if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
          fprintf(stderr, "Couldn't allocate context.");
          exit(-1);
      }
  
      fprintf(stdout, "Testing file truepath.\n");
  
      while (1) {
          fprintf(stdout, "\nEnter a root path$ ");
          if (!gets(rootpath))
              exit(0);
          fprintf(stdout, "Enter an add path$ ");
          if (!gets(addpath))
              exit(0);
          merge_result(rootpath, addpath, 0);
          merge_result(rootpath, addpath, APR_FILEPATH_NOTABOVEROOT);
          merge_result(rootpath, addpath, APR_FILEPATH_SECUREROOT);
          merge_result(rootpath, addpath, APR_FILEPATH_NOTABSOLUTE);
          merge_result(rootpath, addpath, APR_FILEPATH_NOTRELATIVE);
      }
      return (0);
  }
  
  
  

Mime
View raw message