From fd360b205431b5234924596759ef4514dfd59493 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Thu, 23 Feb 2023 02:40:27 -0500
Subject: misc/tal: Fix .info file and compile warnings.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/tal/README         | 12 ++++++++++++
 misc/tal/tal.SlackBuild | 32 ++++++++++++++++++++++++++------
 misc/tal/tal.info       |  4 ++--
 3 files changed, 40 insertions(+), 8 deletions(-)

(limited to 'misc')

diff --git a/misc/tal/README b/misc/tal/README
index 36f8893983b3..e3b1b5b80636 100644
--- a/misc/tal/README
+++ b/misc/tal/README
@@ -6,3 +6,15 @@ they all begin and end on the same column of text. This can be used to
 repair 'broken boxes' or align the backslashes on long macro definitions
 in C programs. But tal will work on any kind of common ending and is
 especially useful as a filter for the vim text editor.
+
+Example: tal turns this:
+
+  /* foo   */
+  /* bar */
+  /* blah blah blah */
+
+...into this:
+
+  /* foo            */
+  /* bar            */
+  /* blah blah blah */
diff --git a/misc/tal/tal.SlackBuild b/misc/tal/tal.SlackBuild
index 6f792c2de8ee..de0560177b14 100644
--- a/misc/tal/tal.SlackBuild
+++ b/misc/tal/tal.SlackBuild
@@ -2,17 +2,23 @@
 
 # Slackware build script for tal
 
-# Copyright 2022 B. Watson <urchlay@slackware.uk>
+# Copyright 2022-2023 B. Watson <urchlay@slackware.uk>
 # Copyright 2018 Donald Cooley South Haven, Indiana USA
-# Written by Peter Wang <novalazy@gmail.com>
+# Written by Peter Wang <email removed>
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230222 bkw: BUILD=3
+# - finally update EMAIL and MAINTAINER in .info file (derp).
+# - make sure $PKG/usr/bin exists before trying to install there.
+# - fix compile warnings.
+# - add example to README.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tal
 VERSION=${VERSION:-1.9}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -59,9 +65,23 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-make CFLAGS="$SLKCFLAGS -ansi" tal
-
-install -D -s -m0755 $PRGNAM $PKG/usr/bin
+# 20230223 bkw: fix a potential bug: uninitialized variable.
+# Honestly this isn't much of a fix: if you have files called foo and
+# bar, and you run "tal foo bar baz" (which is an error, it doesn't
+# take 3 filenames), the outfile_existed variable is supposed to
+# prevent tal from deleting bar if it already existed. Which it
+# does. But instead it truncates bar to 0 bytes, which is actually
+# worse than deleting it IMO. However, I'm leaving the logic as-is.
+# This just makes it always work as the author intended.
+sed -i '/int outfile_existed/s,;, = 0;,' tal.c
+
+# 20230222 bkw: WTF was the -ansi flag being passed? All it did
+# was cause strdup()'s prototype to disappear (implicit declaration
+# warning, plus int-to-pointer cast warnings).
+make CFLAGS="-Wall $SLKCFLAGS" tal
+
+mkdir -p $PKG/usr/bin
+install -s -m0755 $PRGNAM $PKG/usr/bin
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c tal.1 > $PKG/usr/man/man1/tal.1.gz
diff --git a/misc/tal/tal.info b/misc/tal/tal.info
index 7f54583344b5..f98ef4005784 100644
--- a/misc/tal/tal.info
+++ b/misc/tal/tal.info
@@ -6,5 +6,5 @@ MD5SUM="a22e53f5f0d701a408e98e480311700b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
-- 
cgit v1.2.3