projects / packages / cvs.git / blame
| Commit | Line | Data |
|---|---|---|
| 3a862a5e AM |
1 | # |
| 2 | # Added patch to support cvs -W ! - clears all wrappers (patch also | |
| 3 | # forwarded to CVS people) #3374 | |
| 4 | # | |
| 5 | # Patch by Michael Alan Dorman <mdorman@lot49.med.miami.edu> | |
| 6 | diff -ruN cvs-1.12.13-old/src/wrapper.c cvs-1.12.13/src/wrapper.c | |
| 7 | --- cvs-1.12.13-old/src/wrapper.c 2005-09-04 08:27:44.000000000 +0800 | |
| 8 | +++ cvs-1.12.13/src/wrapper.c 2006-02-26 22:26:53.000000000 +0800 | |
| 9 | @@ -86,7 +86,7 @@ | |
| 10 | move this to a per-connection data structure, or better yet | |
| 11 | think about a cleaner solution. */ | |
| 12 | static int wrap_setup_already_done = 0; | |
| 13 | - char *homedir; | |
| 14 | + char *homedir = NULL; | |
| 15 | ||
| 16 | if (wrap_setup_already_done != 0) | |
| 17 | return; | |
| 18 | @@ -107,6 +107,11 @@ | |
| 19 | free (file); | |
| 20 | } | |
| 21 | ||
| 22 | +#ifdef SERVER_SUPPORT | |
| 23 | + if (!server_active) | |
| 24 | +#endif | |
| 25 | + { | |
| 26 | + | |
| 27 | /* Then add entries found in home dir, (if user has one) and file | |
| 28 | exists. */ | |
| 29 | homedir = get_homedir (); | |
| 30 | @@ -115,6 +120,8 @@ | |
| 31 | hand it might be obnoxious to complain when CVS will function | |
| 32 | just fine without .cvswrappers (and many users won't even know what | |
| 33 | .cvswrappers is). */ | |
| 34 | + } | |
| 35 | + | |
| 36 | if (homedir != NULL) | |
| 37 | { | |
| 38 | char *file = strcat_filename_onto_homedir (homedir, CVSDOTWRAPPER); | |
| 39 | @@ -339,6 +346,12 @@ | |
| 40 | if (!line || line[0] == '#') | |
| 41 | return; | |
| 42 | ||
| 43 | + /* Allows user to declare all wrappers null and void */ | |
| 44 | + if ( line[0] == '!') { | |
| 45 | + wrap_kill ( ); | |
| 46 | + return; | |
| 47 | + } | |
| 48 | + | |
| 49 | memset (&e, 0, sizeof(e)); | |
| 50 | ||
| 51 | /* Search for the wild card */ |