From 912151a5b39fb486ff3a0bd84f04a829d73f0f91 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on ChromeOS)" <rob@synchro.net>
Date: Sat, 25 May 2024 19:00:07 -0700
Subject: [PATCH] Display Git branch/hash instead of VERSION for revision info
(like ans2asc)
This should fix the Win32 build.
---
src/sbbs3/asc2ans.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/sbbs3/asc2ans.c b/src/sbbs3/asc2ans.c
index 21be81ba59..80d5327826 100644
--- a/src/sbbs3/asc2ans.c
+++ b/src/sbbs3/asc2ans.c
@@ -22,7 +22,8 @@
#include <stdio.h>
#include <ctype.h> /* toupper */
#include <string.h> /* strcmp */
-#include "sbbsdefs.h" // VERSION
+#include "git_branch.h"
+#include "git_hash.h"
#ifdef _WIN32
#include <windows.h> /* SetConsoleMode */
@@ -32,12 +33,12 @@
#endif
#define CTRL_A '\1'
-#undef ANSI
#define ANSI fprintf(out,"\x1b[")
static void print_usage(const char* prog)
{
- fprintf(stderr,"\nSynchronet Ctrl-A-Code to ANSI-Terminal-Sequence Conversion Utility v%s\n",VERSION);
+ fprintf(stderr,"\nSynchronet Ctrl-A-Code to ANSI-Terminal-Sequence Conversion Utility %s/%s\n"
+ ,GIT_BRANCH, GIT_HASH);
fprintf(stderr,"\nusage: %s infile.asc [outfile.ans] [[option] [...]]\n",prog);
fprintf(stderr,"\noptions:\n\n");
fprintf(stderr,"-strip strip Ctrl-A codes without ANSI equivalent, e.g. pause, delay\n");
--
GitLab