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