-
Notifications
You must be signed in to change notification settings - Fork 265
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2011 from DennisHeimbigner/authfix.dmh
Re-enable DAP2 authorization tests
- Loading branch information
Showing
19 changed files
with
294 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * Copyright 2018, University Corporation for Atmospheric Research | ||
| * See netcdf/COPYRIGHT file for copying and redistribution conditions. | ||
| */ | ||
|
|
||
| #ifdef HAVE_CONFIG_H | ||
| #include "config.h" | ||
| #endif | ||
|
|
||
| #include <stdlib.h> | ||
| #include <stdio.h> | ||
| #include <string.h> | ||
|
|
||
| #ifdef HAVE_UNISTD_H | ||
| #include <unistd.h> | ||
| #endif | ||
| #ifdef HAVE_GETOPT_H | ||
| #include <getopt.h> | ||
| #endif | ||
|
|
||
| #if defined(_WIN32) && !defined(__MINGW32__) | ||
| #include "XGetopt.h" | ||
| #endif | ||
|
|
||
| #include "ncpathmgr.h" | ||
|
|
||
| /* | ||
| Synopsis | ||
| pathcvt [-u|-w|-m|-c] [-e] PATH | ||
| Options | ||
| -e add backslash escapes to '\' and ' ' | ||
| Output type options: | ||
| -u convert to Unix form of path | ||
| -w convert to Windows form of path | ||
| -m convert to MSYS form of path | ||
| -c convert to Cygwin form of path | ||
| Default is to convert to the format used by the platform. | ||
| */ | ||
|
|
||
| #define DEBUG | ||
|
|
||
| struct Options { | ||
| int target; | ||
| int escape; | ||
| int debug; | ||
| } cvtoptions; | ||
|
|
||
| static char* escape(const char* path); | ||
| static void usage(const char* msg); | ||
|
|
||
| int | ||
| main(int argc, char** argv) | ||
| { | ||
| int c; | ||
| char* cvtpath = NULL; | ||
| char* inpath; | ||
|
|
||
| memset((void*)&cvtoptions,0,sizeof(cvtoptions)); | ||
|
|
||
| while ((c = getopt(argc, argv, "cD:ehmuw")) != EOF) { | ||
| switch(c) { | ||
| case 'c': cvtoptions.target = NCPD_CYGWIN; break; | ||
| case 'e': cvtoptions.escape = 1; break; | ||
| case 'h': usage(NULL); break; | ||
| case 'm': cvtoptions.target = NCPD_MSYS; break; | ||
| case 'u': cvtoptions.target = NCPD_NIX; break; | ||
| case 'w': cvtoptions.target = NCPD_WIN; break; | ||
| case 'D': | ||
| sscanf(optarg,"%d",&cvtoptions.debug); | ||
| break; | ||
| case '?': | ||
| usage("unknown option"); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| argc -= optind; | ||
| argv += optind; | ||
|
|
||
| /* If no file arguments left or more than one, print usage message. */ | ||
| if (argc == 0) | ||
| usage("no path specified"); | ||
| if (argc > 1) | ||
| usage("more than one path specified"); | ||
| inpath = argv[0]; | ||
| if(cvtoptions.target == NCPD_UNKNOWN) | ||
| cvtpath = NCpathcvt(inpath); | ||
| else | ||
| cvtpath = NCpathcvt_test(inpath,cvtoptions.target,'c'); | ||
| if(cvtpath && cvtoptions.escape) { | ||
| char* path = cvtpath; cvtpath = NULL; | ||
| cvtpath = escape(path); | ||
| free(path); | ||
| } | ||
| printf("%s",cvtpath); | ||
| if(cvtpath) free(cvtpath); | ||
| return 0; | ||
| } | ||
|
|
||
| static void | ||
| usage(const char* msg) | ||
| { | ||
| if(msg != NULL) fprintf(stderr,"%s\n",msg); | ||
| fprintf(stderr,"pathcvt [-u|-w|-m|-c] PATH\n"); | ||
| if(msg == NULL) exit(0); else exit(1); | ||
| } | ||
|
|
||
| static char* | ||
| escape(const char* path) | ||
| { | ||
| size_t slen = strlen(path); | ||
| const char* p; | ||
| char* q; | ||
| char* epath = NULL; | ||
|
|
||
| epath = (char*)malloc((2*slen) + 1); | ||
| if(epath == NULL) usage("out of memtory"); | ||
| p = path; | ||
| q = epath; | ||
| for(;*p;p++) { | ||
| switch (*p) { | ||
| case '\\': case ' ': | ||
| *q++ = '\\'; | ||
| /* fall thru */ | ||
| default: | ||
| *q++ = *p; | ||
| break; | ||
| } | ||
| } | ||
| *q = '\0'; | ||
| return epath; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| path: /xxx/a/b | ||
| /xxx/a/b | ||
| /cygdrive/c/xxx/a/b | ||
| /c/xxx/a/b | ||
| c:\\xxx\\a\\b | ||
| path: d:/x/y | ||
| /d/x/y | ||
| /cygdrive/d/x/y | ||
| /d/x/y | ||
| d:\\x\\y | ||
| path: /cygdrive/d/x/y | ||
| /d/x/y | ||
| /cygdrive/d/x/y | ||
| /d/x/y | ||
| d:\\x\\y | ||
| path: /d/x/y | ||
| /d/x/y | ||
| /cygdrive/d/x/y | ||
| /d/x/y | ||
| d:\\x\\y | ||
| path: /cygdrive/d | ||
| /d | ||
| /cygdrive/d | ||
| /d | ||
| d: | ||
| path: /d | ||
| /d | ||
| /cygdrive/d | ||
| /d | ||
| d: | ||
| path: /cygdrive/d/git/netcdf-c/dap4_test/test_anon_dim.2.syn | ||
| /d/git/netcdf-c/dap4_test/test_anon_dim.2.syn | ||
| /cygdrive/d/git/netcdf-c/dap4_test/test_anon_dim.2.syn | ||
| /d/git/netcdf-c/dap4_test/test_anon_dim.2.syn | ||
| d:\\git\\netcdf-c\\dap4_test\\test_anon_dim.2.syn | ||
| path: d:\x\y | ||
| /d/x/y | ||
| /cygdrive/d/x/y | ||
| /d/x/y | ||
| d:\\x\\y | ||
| path: d:\x\y w\z | ||
| /d/x/y w/z | ||
| /cygdrive/d/x/y w/z | ||
| /d/x/y w/z | ||
| d:\\x\\y\\ w\\z |
Oops, something went wrong.