VSI Git 2.44-1B

Author: gevorgyans

Documentation/Makefile

@@ -145,16 +145,17 @@ man5dir = $(mandir)/man5
 man7dir = $(mandir)/man7
 # DESTDIR =
 
-GIT_DATE := $(shell git show --quiet --pretty='%as')
+# This is a temporary. It will work once the make process functions correctly.
+# GIT_DATE := $(shell git show --quiet --pretty='%as') 
 
 ASCIIDOC = asciidoc
 ASCIIDOC_EXTRA =
 ASCIIDOC_HTML = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
-		-amanmanual='Git Manual' -amansource='Git $(GIT_VERSION)' \
-		-arevdate='$(GIT_DATE)'
+		-amanmanual='Git Manual' -amansource='Git $(GIT_VERSION)'
+#		-arevdate='$(GIT_DATE)'
 ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)

GIT-VERSION-GEN

@@ -3,6 +3,10 @@
 GVF=GIT-VERSION-FILE
 DEF_VER=v2.44.0
 
+if [ "$1" = "OpenVMS" ]; then
+    GVF=GIT-VERSION-FILE-VMS
+fi
+
 LF='
 '
 

abspath.c

@@ -124,8 +124,11 @@ static char *strbuf_realpath_1(struct strbuf *resolved, const char *path,
 		if (!is_dir_sep(resolved->buf[resolved->len - 1]))
 			strbuf_addch(resolved, '/');
 		strbuf_addbuf(resolved, &next);
-
 		if (lstat(resolved->buf, &st)) {
+#ifdef __VMS
+			if (errno == EPERM)
+				continue;
+#endif
 			/* error out unless this was the last component */
 			if (errno != ENOENT ||
 			   (!(flags & REALPATH_MANY_MISSING) && remaining.len)) {
@@ -298,7 +301,14 @@ void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
 		struct stat cwd_stat, pwd_stat;
 		size_t orig_len = sb->len;
 		char *cwd = xgetcwd();
-		char *pwd = getenv("PWD");
+		char *pwd = NULL;
+#ifdef __VMS
+		pwd = get_cwd();
+		if (!pwd)
+			die("Failed to get current working directory");
+#else
+		pwd = getenv("PWD");
+#endif
 		if (pwd && strcmp(pwd, cwd) &&
 		    !stat(cwd, &cwd_stat) &&
 		    (cwd_stat.st_dev || cwd_stat.st_ino) &&
@@ -311,6 +321,9 @@ void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
 		if (sb->len > orig_len && !is_dir_sep(sb->buf[sb->len - 1]))
 			strbuf_addch(sb, '/');
 		free(cwd);
+#ifdef __VMS
+		free(pwd);
+#endif
 	}
 	strbuf_addstr(sb, path);
 }

add-interactive.c

@@ -691,11 +691,17 @@ static int run_update(struct add_i_state *s, const struct pathspec *ps,
 
 	opts->prompt = N_("Update");
 	count = list_and_choose(s, files, opts);
+#ifdef __VMS
+	if (count == 0 || count == SIZE_MAX) {
+		putchar('\n');
+		return 0;
+	}
+#else
 	if (count <= 0) {
 		putchar('\n');
 		return 0;
 	}
-
+#endif
 	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
 	if (fd < 0) {
 		putchar('\n');
@@ -778,9 +784,13 @@ static int run_revert(struct add_i_state *s, const struct pathspec *ps,
 
 	opts->prompt = N_("Revert");
 	count = list_and_choose(s, files, opts);
+#ifdef __VMS
+	if (count == 0 || count == SIZE_MAX)
+		goto finish_revert;
+#else
 	if (count <= 0)
 		goto finish_revert;
-
+#endif
 	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
 	if (fd < 0) {
 		res = -1;
@@ -889,9 +899,13 @@ static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps,
 	d->only_names = 1;
 	count = list_and_choose(s, files, opts);
 	d->only_names = 0;
+#ifdef __VMS
+	if (count == 0 || count == SIZE_MAX)
+		goto finish_add_untracked;
+#else
 	if (count <= 0)
 		goto finish_add_untracked;
-
+#endif
 	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
 	if (fd < 0) {
 		res = -1;

async_proc_wrapper.c

@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "vms/vms_wrapper.h"
+#include "async_procs.h"
+
+typedef int (*async_proc_func)(int proc_in, int proc_out, void *data);
+extern  int process_is_async;
+
+/*
+** Helper function to get the appropriate function pointer.
+*/
+async_proc_func get_async_proc_func(const char *func_name)
+{
+	if (strcmp(func_name, "filter_buffer_or_fd") == 0)
+		return filter_buffer_or_fd;
+	else if (strcmp(func_name, "copy_to_sideband") == 0)
+		return copy_to_sideband;
+	else if (strcmp(func_name, "sideband_demux") == 0)
+		return sideband_demux;
+	else if (strcmp(func_name, "sideband_demux_fetch") == 0)
+		return sideband_demux_fetch;
+	else return NULL;
+}
+
+int common_exit(const char *file, int line, int code) { return 0; }
+
+int main(int argc, char *argv[])
+{
+	if (argc < 6) {
+		fprintf(stderr, "Usage: %s <func_name> <proc_in> <proc_out> <data>\n", argv[0]);
+		return 1;
+	}
+
+	const char *func_name = argv[1];
+	int proc_in_0  = atoi(argv[2]);
+	int proc_in_1  = atoi(argv[3]);
+	int proc_out_0 = atoi(argv[4]);
+	int proc_out_1 = atoi(argv[5]);
+	void *data = NULL;
+	if (argc == 7)
+		data = (void*)argv[6];
+
+	if (proc_in_1  != -1) close(proc_in_1);
+	if (proc_out_0 != -1) close(proc_out_0);
+	git_atexit_clear();
+	process_is_async = 1;
+
+	async_proc_func proc = get_async_proc_func(func_name);
+	if (!proc) {
+		fprintf(stderr, "Invalid function name: %s\n", func_name);
+		return 1;
+	}
+	int result = proc(proc_in_0, proc_out_1, data);
+	exit(!!result);
+}

async_procs.h

@@ -0,0 +1,11 @@
+#ifndef ASYNC_PROCS_H
+#define ASYNC_PROCS_H
+
+void git_atexit_clear(void);
+
+int filter_buffer_or_fd (int proc_in, int proc_out, void *data);
+int copy_to_sideband    (int proc_in, int proc_out, void *data);
+int sideband_demux      (int proc_in, int proc_out, void *data);
+int sideband_demux_fetch(int proc_in, int proc_out, void *data);
+
+#endif /* ASYNC_PROCS_H */

attr.c

@@ -199,8 +199,13 @@ static int attr_name_valid(const char *name, size_t namelen)
 	 * Attribute name cannot begin with '-' and must consist of
 	 * characters from [-A-Za-z0-9_.].
 	 */
+#ifdef __VMS
+	if (namelen == 0 || namelen == SIZE_MAX || *name == '-')
+		return 0;
+#else
 	if (namelen <= 0 || *name == '-')
 		return 0;
+#endif
 	while (namelen--) {
 		char ch = *name++;
 		if (! (ch == '-' || ch == '.' || ch == '_' ||

bisect.c

@@ -452,7 +452,9 @@ static int register_ref(const char *refname, const struct object_id *oid,
 	struct strbuf good_prefix = STRBUF_INIT;
 	strbuf_addstr(&good_prefix, term_good);
 	strbuf_addstr(&good_prefix, "-");
-
+#ifdef __VMS
+	remove_last_char_if_dot((char *)refname);
+#endif
 	if (!strcmp(refname, term_bad)) {
 		current_bad_oid = xmalloc(sizeof(*current_bad_oid));
 		oidcpy(current_bad_oid, oid);

builtin/am.c

@@ -2390,7 +2390,11 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),
 		{ OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
 		  N_("GPG-sign commits"),
+#ifdef __VMS
+		  PARSE_OPT_OPTARG, NULL, (intptr_t)(const void *) "" },
+#else
 		  PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+#endif
 		OPT_CALLBACK_F(0, "empty", &state.empty_type, "(stop|drop|keep)",
 		  N_("how to handle empty patches"),
 		  PARSE_OPT_NONEG, am_option_parse_empty),

builtin/clone.c

@@ -125,7 +125,11 @@ static struct option builtin_clone_options[] = {
 		    N_("setup as shared repository")),
 	{ OPTION_CALLBACK, 0, "recurse-submodules", &option_recurse_submodules,
 	  N_("pathspec"), N_("initialize submodules in the clone"),
+#ifdef __VMS
+	  PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)(const void *)"." },
+#else
 	  PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)"." },
+#endif
 	OPT_ALIAS(0, "recursive", "recurse-submodules"),
 	OPT_INTEGER('j', "jobs", &max_jobs,
 		    N_("number of submodules cloned in parallel")),
@@ -1002,6 +1006,18 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		dir = git_url_basename(repo_name, is_bundle, option_bare);
 	strip_dir_trailing_slashes(dir);
 
+#ifdef __VMS
+	struct strbuf target_path = STRBUF_INIT;
+	char tmp_dir[MAXPATHLEN];
+	snprintf(tmp_dir, sizeof(tmp_dir), "%s", dir);
+	if (get_logical_name(tmp_dir) != NULL) {
+		strbuf_addstr(&target_path, "./");
+		strbuf_addstr(&target_path, dir);
+
+		free(dir);
+		dir = xstrdup(target_path.buf);
+	}
+#endif
 	dest_exists = path_exists(dir);
 	if (dest_exists && !is_empty_dir(dir))
 		die(_("destination path '%s' already exists and is not "
@@ -1458,6 +1474,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	free_refs(remote_head_points_at);
 	free(unborn_head);
 	free(dir);
+#ifdef __VMS
+	strbuf_release(&target_path);
+#endif
 	free(path);
 	free(repo_to_free);
 	junk_mode = JUNK_LEAVE_ALL;