Module Name: src
Committed By: christos
Date: Sun Feb 4 20:47:26 UTC 2024
Modified Files:
src/external/gpl2/xcvs/dist/src: cvs.h main.c recurse.c
Log Message:
mention which processing step we are in.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/src/cvs.h
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/src/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/recurse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/cvs.h
diff -u src/external/gpl2/xcvs/dist/src/cvs.h:1.5 src/external/gpl2/xcvs/dist/src/cvs.h:1.6
--- src/external/gpl2/xcvs/dist/src/cvs.h:1.5 Fri Sep 15 17:03:26 2017
+++ src/external/gpl2/xcvs/dist/src/cvs.h Sun Feb 4 15:47:25 2024
@@ -878,6 +878,7 @@ char *expand_path (const char *name, con
/* User variables. */
extern List *variable_list;
+extern const char *processing;
/* cvsacl patch */
extern int cvsacl (int argc, char **argv);
Index: src/external/gpl2/xcvs/dist/src/main.c
diff -u src/external/gpl2/xcvs/dist/src/main.c:1.8 src/external/gpl2/xcvs/dist/src/main.c:1.9
--- src/external/gpl2/xcvs/dist/src/main.c:1.8 Thu Jan 20 09:46:06 2022
+++ src/external/gpl2/xcvs/dist/src/main.c Sun Feb 4 15:47:25 2024
@@ -17,7 +17,7 @@
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.8 2022/01/20 14:46:06 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2024/02/04 20:47:25 christos Exp $");
#include "cvs.h"
@@ -29,6 +29,7 @@ __RCSID("$NetBSD: main.c,v 1.8 2022/01/2
const char *program_name;
const char *program_path;
const char *cvs_cmd_name;
+const char *processing = "init";
const char *global_session_id; /* Random session ID */
@@ -516,8 +517,8 @@ show_status (int n)
if (getcwd(wd, sizeof(wd)) == NULL)
return;
- n = snprintf(buf, sizeof(buf), "%s[%d]: working in %s\n", getprogname(),
- (int)getpid(), wd);
+ n = snprintf(buf, sizeof(buf), "%s[%d]: %s in %s\n", getprogname(),
+ (int)getpid(), processing, wd);
if (n <= 0)
return;
write(ttyfd, buf, (size_t)n);
Index: src/external/gpl2/xcvs/dist/src/recurse.c
diff -u src/external/gpl2/xcvs/dist/src/recurse.c:1.3 src/external/gpl2/xcvs/dist/src/recurse.c:1.4
--- src/external/gpl2/xcvs/dist/src/recurse.c:1.3 Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/recurse.c Sun Feb 4 15:47:25 2024
@@ -14,7 +14,7 @@
*
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: recurse.c,v 1.3 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: recurse.c,v 1.4 2024/02/04 20:47:25 christos Exp $");
#include "cvs.h"
#include "save-cwd.h"
@@ -748,6 +748,7 @@ do_recursion (struct recursion_frame *fr
if (dirlist != NULL && filelist == NULL)
dodoneproc = 0;
+ processing = "scan";
/*
* If filelist or dirlist is already set, we don't look again. Otherwise,
* find the files and directories
@@ -810,6 +811,8 @@ do_recursion (struct recursion_frame *fr
}
}
+ processing = "process";
+
/* process the files (if any) */
if (process_this_directory && filelist != NULL && frame->fileproc)
{
@@ -859,6 +862,8 @@ do_recursion (struct recursion_frame *fr
dellist (&filelist);
}
+ processing = "cleanup";
+
/* call-back files done proc (if any) */
if (process_this_directory && dodoneproc && frame->filesdoneproc != NULL)
err = frame->filesdoneproc (frame->callerdat, err, repository,
