[Cvs-nserver-commits] CVS: cvs-nserver/src ls.c,1.1.2.12,1.1.2.13 lsmodules.c,1.1.2.6,1.1.2.7

[Alexey M. <mo...@us...>]

Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv522

Modified Files:
      Tag: NCLI-1-11-1
	ls.c lsmodules.c 
Log Message:
lsmodules now displays files in root directory of the repository (using
file listing procededure from ls.c). output format slightly changed and
follows ls output format


Index: ls.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/ls.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- ls.c	3 May 2002 07:42:15 -0000	1.1.2.12
+++ ls.c	4 Jun 2002 08:02:44 -0000	1.1.2.13
@@ -117,7 +117,7 @@
 }
 
 
-static int
+int
 ls_fileproc (void *callerdat, struct file_info *finfo)
 {
     char *rev;
@@ -130,13 +130,12 @@
     char timestamp[32];
     int ts_len;
     int single_file;
-    char *xbranch;
+    char *xbranch = (tagname) ? tagname : "trunk";
     int perm;
     Vers_TS *ts;
 
 #ifdef SERVER_SUPPORT
     if (dir_acl == NULL) {
-	xbranch = (tagname) ? tagname : "trunk";
 	if ((dir_acl = get_dir_acl(finfo->repository,xbranch)) == NULL)
 	    error(1, 0, "Error getting directory ACL for %s: %s", finfo->repository, strerror(errno));
 	single_file = 1;

Index: lsmodules.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/lsmodules.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- lsmodules.c	30 May 2002 13:54:46 -0000	1.1.2.6
+++ lsmodules.c	4 Jun 2002 08:02:44 -0000	1.1.2.7
@@ -34,7 +34,7 @@
 static void
 lsmodules_print(const char *module, int perm)
 {
-#if 0    
+#if 1   
     cvs_output("D/", 2);
 #endif
     if (mod_list != ALL_MOD_LIST && perm == dir_perm_none)
@@ -207,6 +207,7 @@
     return 0;
 }
 
+extern int ls_fileproc(void *callerdat, struct file_info *finfo);
 
 static int
 lsmodules_real(void)
@@ -217,7 +218,7 @@
     deep = 0;
     if (CVS_CHDIR(current_parsed_root->directory) < 0)
 	return 1;
-    return start_recursion ((FILEPROC) NULL, (FILESDONEPROC) NULL,
+    return start_recursion (ls_fileproc, (FILESDONEPROC) NULL,
 			    lsmodules_dirproc, (DIRLEAVEPROC) NULL,
 			    (void *) NULL, argc , argv, 0, which, 0, 1,"", 1);
 }