diff options
| author | wiz <wiz@NetBSD.org> | 2000-10-26 14:59:06 +0000 |
|---|---|---|
| committer | wiz <wiz@NetBSD.org> | 2000-10-26 14:59:06 +0000 |
| commit | 2b12e010265cefa3617d277b4e06d05f2f23be5d (patch) | |
| tree | 81ad07e98967225bfc8510156a86379017a4d518 /gnu/dist/cvs/src/mkmodules.c | |
| parent | 528e3141438189ff8c6b92c2f415f47edfeaed0e (diff) | |
resolve conflicts from cvs-1.11 import
Diffstat (limited to 'gnu/dist/cvs/src/mkmodules.c')
| -rw-r--r-- | gnu/dist/cvs/src/mkmodules.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/gnu/dist/cvs/src/mkmodules.c b/gnu/dist/cvs/src/mkmodules.c index f576ed2c2dd..434402d6fcd 100644 --- a/gnu/dist/cvs/src/mkmodules.c +++ b/gnu/dist/cvs/src/mkmodules.c @@ -280,15 +280,24 @@ static const char *const config_contents[] = { "# Set this to \"no\" if pserver shouldn't check system users/passwords\n", "#SystemAuth=no\n", "\n", + "# Put CVS lock files in this directory rather than directly in the repository.\n", + "#LockDir=/var/lock/cvs\n", + "\n", +#ifdef PRESERVE_PERMISSIONS_SUPPORT "# Set `PreservePermissions' to `yes' to save file status information\n", "# in the repository.\n", "#PreservePermissions=no\n", "\n", +#endif "# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top\n", "# level of the new working directory when using the `cvs checkout'\n", "# command.\n", "#TopLevelAdmin=no\n", "\n", + "# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the\n", + "# history file, or a subset as needed (ie `TMAR' logs all write operations)\n", + "#LogHistory=TOFEWGCMAR\n", + "\n", "# Set this to the name of a local tag to use in addition to Id\n", "#tag=OurTag\n", NULL @@ -375,6 +384,9 @@ mkmodules (dir) size_t line_allocated = 0; const struct admin_file *fileptr; + if (noexec) + return 0; + if (save_cwd (&cwd)) error_exit (); @@ -869,7 +881,7 @@ init (argc, argv) error (1, errno, "cannot change to directory %s", adm); /* Make Emptydir so it's there if we need it */ - make_directory (CVSNULLREPOS); + mkdir_if_needed (CVSNULLREPOS); /* 80 is long enough for all the administrative file names, plus "/" and so on. */ @@ -939,6 +951,24 @@ init (argc, argv) chmod (info, 0666); } + /* Make an empty val-tags file to prevent problems creating it later. */ + strcpy (info, adm); + strcat (info, "/"); + strcat (info, CVSROOTADM_VALTAGS); + if (!isfile (info)) + { + FILE *fp; + + fp = open_file (info, "w"); + if (fclose (fp) < 0) + error (1, errno, "cannot close %s", info); + + /* Make the new val-tags file world-writeable, since every CVS + user will need to be able to write to it. We use chmod() + because xchmod() is too shy. */ + chmod (info, 0666); + } + free (info); free (info_v); |
