 @@ -8,26 +8,27 @@
  * Portions Copyright (C) 1989-1992, Brian Berliner
+ *
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
+ *
  * Tag and Rtag
+ *
  * Add or delete a symbolic name to an RCS file, or a collection of RCS files.
  * Tag uses the checked out revision in the current directory, rtag uses
  * the modules database, if necessary.
  */
 #include "cvs.h"
 #include <grp.h>
 #include "save-cwd.h"
 static int rtag_proc (int argc, char **argv, char *xwhere,
 		      char *mwhere, char *mfile, int shorten,
 		      int local_specified, char *mname, char *msg);
 static int check_fileproc (void *callerdat, struct file_info *finfo);
 static int check_filesdoneproc (void *callerdat, int err,
 				const char *repos, const char *update_dir,
 				List *entries);
 static int pretag_proc (const char *_repository, const char *_filter,
                         void *_closure);
 static void masterlist_delproc (Node *_p);
 static void tag_delproc (Node *_p);
 @@ -96,44 +97,49 @@ static const char *const tag_usage[] =
     "\t-B\tAllows -F and -d to disturb branch tags.  Use with extreme care.\n",
     "\t-c\tCheck that working files are unmodified.\n",
     "\t-d\tDelete the given tag.\n",
     "\t-F\tMove tag if it already exists.\n",
     "\t-f\tForce a head revision match if tag/date not found.\n",
     "\t-l\tLocal directory only, not recursive.\n",
     "\t-R\tProcess directories recursively.\n",
     "\t-r rev\tExisting revision/tag.\n",
     "\t-D\tExisting date.\n",
     "(Specify the --help global option for a list of other help options)\n",
     NULL
 };
 char *UserTagOptions = "bcflRrD";
 int
 cvstag (int argc, char **argv)
+{
     struct group *grp;
     bool local = false;			/* recursive by default */
     int c;
     int err = 0;
     bool run_module_prog = true;
     int only_allowed_options;
     is_rtag = (strcmp (cvs_cmd_name, "rtag") == 0);
     if (argc == -1)
 	usage (is_rtag ? rtag_usage : tag_usage);
     getoptreset ();
     only_allowed_options = 1;
     while ((c = getopt (argc, argv, is_rtag ? rtag_opts : tag_opts)) != -1)
+    {
 	if (!strchr(UserTagOptions, c))
 	    only_allowed_options = 0;
 	switch (c)
+	{
 	    case 'a':
 		attic_too = true;
 		break;
 	    case 'b':
 		branch_mode = true;
 		break;
 	    case 'B':
 		disturb_branch_tags = true;
 		break;
 	    case 'c':
 		check_uptodate = true;
 @@ -183,26 +189,62 @@ cvstag (int argc, char **argv)
     if (argc < (is_rtag ? 2 : 1))
 	usage (is_rtag ? rtag_usage : tag_usage);
     symtag = argv[0];
     argc--;
     argv++;
     if (date && delete_flag)
 	error (1, 0, "-d makes no sense with a date specification.");
     if (delete_flag && branch_mode)
 	error (0, 0, "warning: -b ignored with -d options");
     RCS_check_tag (symtag);
 #ifdef CVS_ADMIN_GROUP
     if (!only_allowed_options &&
 	(grp = getgrnam(CVS_ADMIN_GROUP)) != NULL)
+    {
 #ifdef HAVE_GETGROUPS
 	gid_t *grps;
 	int i, n;
 	/* get number of auxiliary groups */
 	n = getgroups (0, NULL);
 	if (n < 0)
 	    error (1, errno, "unable to get number of auxiliary groups");
 	grps = (gid_t *) xmalloc((n + 1) * sizeof *grps);
 	n = getgroups (n, grps);
 	if (n < 0)
 	    error (1, errno, "unable to get list of auxiliary groups");
 	grps[n] = getgid();
 	for (i = 0; i <= n; i++)
 	    if (grps[i] == grp->gr_gid) break;
 	free (grps);
 	if (i > n)
 	    error (1, 0, "usage is restricted to members of the group %s",
 		   CVS_ADMIN_GROUP);
 #else
 	char *me = getcaller();
 	char **grnam;
 	for (grnam = grp->gr_mem; *grnam; grnam++)
 	    if (strcmp (*grnam, me) == 0) break;
 	if (!*grnam && getgid() != grp->gr_gid)
 	    error (1, 0, "usage is restricted to members of the group %s",
 		   CVS_ADMIN_GROUP);
 #endif
+    }
 #endif /* defined CVS_ADMIN_GROUP */
 #ifdef CLIENT_SUPPORT
     if (current_parsed_root->isremote)
+    {
 	/* We're the client side.  Fire up the remote server.  */
 	start_server ();
 	ign_setup ();
 	if (attic_too)
 	    send_arg ("-a");
 	if (branch_mode)
 	    send_arg ("-b");
 	if (disturb_branch_tags)
 @@ -261,26 +303,33 @@ cvstag (int argc, char **argv)
+	{
 	    /* XXX last arg should be repository, but doesn't make sense here */
 	    history_write ('T', (delete_flag ? "D" : (numtag ? numtag :
 			   (date ? date : "A"))), symtag, argv[i], "");
 	    err += do_module (db, argv[i], TAG,
 			      delete_flag ? "Untagging" : "Tagging",
 			      rtag_proc, NULL, 0, local, run_module_prog,
 , symtag);
+	}
 	close_module (db);
+    }
     else
+    {
 	int i;
 	for (i = 0; i < argc; i++)
+	{
 	    /* XXX last arg should be repository, but doesn't make sense here */
 	    history_write ('T', (delete_flag ? "D" : (numtag ? numtag :
 			   (date ? date : "A"))), symtag, argv[i], "");
+	}
 	err = rtag_proc (argc + 1, argv - 1, NULL, NULL, NULL, 0, local, NULL,
 			 NULL);
+    }
     return err;
+}
 struct pretag_proc_data {
      List *tlist;
      bool delete_flag;
      bool force_tag_move;
 @@ -938,26 +987,45 @@ rtag_fileproc (void *callerdat, struct f
     /* find the parsed RCS data */
     if ((rcsfile = finfo->rcs) == NULL)
+    {
 	retval = 1;
 	goto free_vars_and_return;
+    }
     /*
      * For tagging an RCS file which is a symbolic link, you'd best be
      * running with RCS 5.6, since it knows how to handle symbolic links
      * correctly without breaking your link!
      */
 /* cvsacl patch */
 #ifdef SERVER_SUPPORT
     if (use_cvs_acl /* && server_active */)
+    {
 	if (!access_allowed (finfo->file, finfo->repository, numtag, 4,
 	    NULL, NULL, 1))
+	{
 	    if (stop_at_first_permission_denied)
 		error (1, 0, "permission denied for %s",
 		       Short_Repository (finfo->repository));
 	    else
 		error (0, 0, "permission denied for %s/%s",
 		       Short_Repository (finfo->repository), finfo->file);
 	    return (0);
+	}
+    }
 #endif
     if (delete_flag)
+    {
 	retval = rtag_delete (rcsfile);
 	goto free_vars_and_return;
+    }
     /*
      * If we get here, we are adding a tag.  But, if -a was specified, we
      * need to check to see if a -r or -D option was specified.  If neither
      * was specified and the file is in the Attic, remove the tag.
      */
     if (attic_too && (!numtag && !date))
+    {
 @@ -1157,26 +1225,41 @@ tag_fileproc (void *callerdat, struct fi
     int retcode = 0;
     int retval = 0;
     static bool valtagged = false;
     vers = Version_TS (finfo, NULL, NULL, NULL, 0, 0);
     if (numtag || date)
+    {
         nversion = RCS_getversion (vers->srcfile, numtag, date,
                                    force_tag_match, NULL);
         if (!nversion)
 	    goto free_vars_and_return;
+    }
 /* cvsacl patch */
 #ifdef SERVER_SUPPORT
 	if (use_cvs_acl /* && server_active */)
+	{
 	if (!access_allowed (finfo->file, finfo->repository, vers->tag, 4,
 			     NULL, NULL, 1))
+	{
 	    error (0, 0, "permission denied for %s/%s",
 		   Short_Repository (finfo->repository), finfo->file);
 	    return (0);
+	}
+    }
 #endif
     if (delete_flag)
+    {
 	int isbranch;
 	/*
 	 * If -d is specified, "force_tag_match" is set, so that this call to
 	 * RCS_getversion() will return a NULL version string if the symbolic
 	 * tag does not exist in the RCS file.
+	 *
 	 * This is done here because it's MUCH faster than just blindly calling
 	 * "rcs" to remove the tag... trust me.
 	 */