diff options
Diffstat (limited to 'contrib/cvs/src/add.c')
| -rw-r--r-- | contrib/cvs/src/add.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/contrib/cvs/src/add.c b/contrib/cvs/src/add.c index d71716b..4f3f55e 100644 --- a/contrib/cvs/src/add.c +++ b/contrib/cvs/src/add.c @@ -187,16 +187,6 @@ add (argc, argv) /* FIXME: Does this erroneously call Create_Admin in error conditions which are only detected once the server gets its hands on things? */ - /* FIXME-also: if filenames are case-insensitive on the - client, and the directory in the repository already - exists and is named "foo", and the command is "cvs add - FOO", this call to Create_Admin puts the wrong thing in - CVS/Repository and so a subsequent "cvs update" will - give an error. The fix will be to have the server report - back what it actually did (e.g. use tagged text for the - "Directory %s added" message), and then Create_Admin, - which should also fix the error handling concerns. */ - if (isdir (argv[j])) { char *tag; @@ -698,9 +688,11 @@ cannot resurrect %s; RCS file removed by second party", finfo.fullname); if (options) free (options); - return (err); + return err; } + + /* * The specified user file is really a directory. So, let's make sure that * it is created in the RCS source repository, and that the user's directory @@ -728,12 +720,12 @@ add_directory (finfo) /* "Can't happen". */ error (0, 0, "directory %s not added; must be a direct sub-directory", dir); - return (1); + return 1; } if (fncmp (dir, CVSADM) == 0) { error (0, 0, "cannot add a `%s' directory", CVSADM); - return (1); + return 1; } /* before we do anything else, see if we have any per-directory tags */ @@ -875,7 +867,7 @@ out: free_cwd (&cwd); if (rcsdir != NULL) free (rcsdir); - return (0); + return 0; } @@ -898,7 +890,7 @@ build_entry (repository, user, options, message, entries, tag) FILE *fp; if (noexec) - return (0); + return 0; /* * The requested log is read directly from the user and stored in the @@ -923,5 +915,5 @@ build_entry (repository, user, options, message, entries, tag) (void) sprintf (line, "Initial %s", user); Register (entries, user, "0", line, options, tag, (char *) 0, (char *) 0); free (line); - return (0); + return 0; } |
