 @@ -9,27 +9,27 @@
+ *
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS kit.
  */
 /*
  * basic information used in all source files
+ *
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>		/* this is stuff found via autoconf */
-#endif /* CONFIG_H */
+#endif /* HAVE_CONFIG_H */
 /* Add GNU attribute suppport.  */
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # else
 #   if __GNUC__ == 2 && __GNUC_MINOR__ < 96
 #    define __pure__	/* empty */
 #   endif
 #   if __GNUC__ < 3
 #    define __malloc__	/* empty */
 #   endif
 @@ -179,26 +179,31 @@ char *strerror (int);
 #define CVSROOTADM_POSTPROXY	"postproxy"
 #define CVSROOTADM_POSTTAG	"posttag"
 #define CVSROOTADM_POSTWATCH	"postwatch"
 #define CVSROOTADM_PREPROXY	"preproxy"
 #define	CVSROOTADM_RCSINFO	"rcsinfo"
 #define CVSROOTADM_READERS	"readers"
 #define CVSROOTADM_TAGINFO      "taginfo"
 #define CVSROOTADM_USERS	"users"
 #define CVSROOTADM_VALTAGS	"val-tags"
 #define CVSROOTADM_VERIFYMSG    "verifymsg"
 #define CVSROOTADM_WRAPPER	"cvswrappers"
 #define CVSROOTADM_WRITERS	"writers"
 /* cvsacl patch */
 #define CVSROOTADM_ACLCONFIG	"aclconfig"
 #define CVSROOTADM_ACCESS	"access"
 #define CVSROOTADM_GROUP	"group"
 #define CVSNULLREPOS		"Emptydir"	/* an empty directory */
 /* Other CVS file names */
 /* Files go in the attic if the head main branch revision is dead,
    otherwise they go in the regular repository directories.  The whole
    concept of having an attic is sort of a relic from before death
    support but on the other hand, it probably does help the speed of
    some operations (such as main branch checkouts and updates).  */
 #define	CVSATTIC	"Attic"
 #define	CVSLCK		"#cvs.lock"
 #define	CVSHISTORYLCK	"#cvs.history.lock"
 @@ -449,26 +454,42 @@ int diff_exec (const char *file1, const
 #include "error.h"
 /* If non-zero, error will use the CVS protocol to report error
  * messages.  This will only be set in the CVS server parent process;
  * most other code is run via do_cvs_command, which forks off a child
  * process and packages up its stderr in the protocol.
+ *
  * This needs to be here rather than in error.h in order to use an unforked
  * error.h from GNULIB.
  */
 extern int error_use_protocol;
 /* cvsacl patch */
 /* ACL Patch settings from CVSROOT/config */
 extern int use_cvs_acl;
 extern char *cvs_acl_default_permissions;
 extern int use_cvs_groups;
 extern int use_system_groups;
 extern int use_separate_acl_file_for_each_dir;
 extern char *cvs_acl_file_location;
 extern char *cvs_groups_file_location;
 extern char *cvs_server_run_as;
 extern int stop_at_first_permission_denied;
 int given_perms_valid (const char *cperms);
 int
 access_allowed (const char *file, const char *repos, const char *tag,
 		int perm, char **mline, int *mpos, int usecache);
 DBM *open_module (void);
 List *Find_Directories (char *repository, int which, List *entries);
 void Entries_Close (List *entries);
 List *Entries_Open (int aflag, char *update_dir);
 void Subdirs_Known (List *entries);
 void Subdir_Register (List *, const char *, const char *);
 void Subdir_Deregister (List *, const char *, const char *);
 const char *getCVSDir (const char *);
 void parse_tagdate (char **tag, char **date, const char *input);
 char *Make_Date (const char *rawdate);
 char *date_from_time_t (time_t);
 @@ -848,26 +869,29 @@ void wrap_add_file (const char *file,int
 void wrap_add (char *line,int temp);
 void wrap_send (void);
 #if defined(SERVER_SUPPORT) || defined(CLIENT_SUPPORT)
 void wrap_unparse_rcs_options (char **, int);
 #endif /* SERVER_SUPPORT || CLIENT_SUPPORT */
 /* Pathname expansion */
 char *expand_path (const char *name, const char *cvsroot, bool formatsafe,
 		   const char *file, int line);
 /* User variables.  */
 extern List *variable_list;
 /* cvsacl patch */
 extern int cvsacl (int argc, char **argv);
 void variable_set (char *nameval);
 int watch (int argc, char **argv);
 int edit (int argc, char **argv);
 int unedit (int argc, char **argv);
 int editors (int argc, char **argv);
 int watchers (int argc, char **argv);
 int annotate (int argc, char **argv);
 int add (int argc, char **argv);
 int admin (int argc, char **argv);
 int checkout (int argc, char **argv);
 int commit (int argc, char **argv);
 int diff (int argc, char **argv);