diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1994-05-26 06:06:47 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1994-05-26 06:06:47 +0000 |
commit | bd8aeda5ce87ba95ed11573ac873970372afe66f (patch) | |
tree | ad401e41b637b5be565876b6c80cd9e142a5eefa /gnu | |
parent | 0882205071f990198308fc03f1f0c58c586f2e9b (diff) | |
download | FreeBSD-src-bd8aeda5ce87ba95ed11573ac873970372afe66f.zip FreeBSD-src-bd8aeda5ce87ba95ed11573ac873970372afe66f.tar.gz |
Got this fix from think.com:
The following two patches should allow the documented "-I !" option to
skip the ignore lists and import/update all files in the directory.
I need it to force certain files to import (ie, csh.a which is part of
the csh documentation).
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/cvs/cvs/ignore.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/cvs/import.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gnu/usr.bin/cvs/cvs/ignore.c b/gnu/usr.bin/cvs/cvs/ignore.c index 74ab90c..8236487 100644 --- a/gnu/usr.bin/cvs/cvs/ignore.c +++ b/gnu/usr.bin/cvs/cvs/ignore.c @@ -147,7 +147,7 @@ ign_add (ign, hold) * (saving it if necessary). We also catch * as a special case in a * global ignore file as an optimization */ - if (isspace (*(ign + 1)) && (*ign == '!' || *ign == '*')) + if ((!*(ign+1) || isspace (*(ign+1))) && (*ign == '!' || *ign == '*')) { if (!hold) { diff --git a/gnu/usr.bin/cvs/cvs/import.c b/gnu/usr.bin/cvs/cvs/import.c index 095a800..288b9b2 100644 --- a/gnu/usr.bin/cvs/cvs/import.c +++ b/gnu/usr.bin/cvs/cvs/import.c @@ -330,10 +330,14 @@ import_descend (message, vtag, targc, targv) { while ((dp = readdir (dirp)) != NULL) { - if (ign_name (dp->d_name) || !isdir (dp->d_name)) + if (!strcmp(".", dp->d_name) || !strcmp("..", dp->d_name)) + continue; + if (!isdir (dp->d_name) || ign_name (dp->d_name)) continue; err += import_descend_dir (message, dp->d_name, vtag, targc, targv); + /* need to re-load .cvsignore after each dir traversal */ + ign_add_file (CVSDOTIGNORE, 1); } (void) closedir (dirp); } |