X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=fa384f9e224756f1da2a56cace6b107bfedebd75;hb=a5b93632b1d64c8ff699d8e8248d6ac4d1c7dbc6;hp=47e73191acec7a419541b448eb09938de107e323;hpb=9c3aa396f4b0e3dfe37a4f7784ca008a6f5046d0;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 47e7319..fa384f9 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -51,11 +51,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-static const char	*cvstag =
-    "$scrotwm$";
-
-#define	SWM_VERSION	"0.9.34"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
@@ -92,6 +87,14 @@ static const char	*cvstag =
 #include <osx.h>
 #endif
 
+#include "version.h"
+
+#ifdef SCROTWM_BUILDSTR
+static const char	*buildstr = SCROTWM_BUILDSTR;
+#else
+static const char	*buildstr = SCROTWM_VERSION;
+#endif
+
 #if RANDR_MAJOR < 1
 #  error XRandR versions less than 1.0 are not supported
 #endif
@@ -1144,7 +1147,7 @@ setscreencolor(char *val, int i, int c)
 void
 fancy_stacker(struct workspace *ws)
 {
-	strcpy(ws->stacker, "[   ]");
+	strlcpy(ws->stacker, "[   ]", sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == vertical_stack)
 		snprintf(ws->stacker, sizeof ws->stacker, "[%d|%d]",
 		    ws->l_state.vertical_mwin, ws->l_state.vertical_stacks);
@@ -1156,11 +1159,11 @@ fancy_stacker(struct workspace *ws)
 void
 plain_stacker(struct workspace *ws)
 {
-	strcpy(ws->stacker, "[ ]");
+	strlcpy(ws->stacker, "[ ]", sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == vertical_stack)
-		strcpy(ws->stacker, "[|]");
+		strlcpy(ws->stacker, "[|]", sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == horizontal_stack)
-		strcpy(ws->stacker, "[-]");
+		strlcpy(ws->stacker, "[-]", sizeof ws->stacker);
 }
 
 void
@@ -1324,7 +1327,7 @@ bar_update(void)
 	char			s[SWM_BAR_MAX];
 	char			cn[SWM_BAR_MAX];
 	char			loc[SWM_BAR_MAX];
-	char			*b;
+	char			*b, *stack = "";
 
 	if (bar_enabled == 0)
 		return;
@@ -1361,10 +1364,11 @@ bar_update(void)
 				bar_class_name(cn, sizeof cn, r->ws->focus);
 				bar_window_name(cn, sizeof cn, r->ws->focus);
 			}
+			if (stack_enabled)
+				stack = r->ws->stacker;
 
 			snprintf(loc, sizeof loc, "%d:%d %s   %s%s    %s    %s",
-			    x++, r->ws->idx + 1, r->ws->stacker, s, cn, bar_ext,
-			    bar_vertext);
+			    x++, r->ws->idx + 1, stack, s, cn, bar_ext, bar_vertext);
 			bar_print(r, loc);
 		}
 	}
@@ -1540,8 +1544,8 @@ version(struct swm_region *r, union arg *args)
 {
 	bar_version = !bar_version;
 	if (bar_version)
-		snprintf(bar_vertext, sizeof bar_vertext, "Version: %s CVS: %s",
-		    SWM_VERSION, cvstag);
+		snprintf(bar_vertext, sizeof bar_vertext, "Version: %s Build: %s",
+		    SCROTWM_VERSION, buildstr);
 	else
 		strlcpy(bar_vertext, "", sizeof bar_vertext);
 	bar_update();
@@ -3214,7 +3218,7 @@ search_do_resp(void)
 
 	if ((resp = calloc(1, MAX_RESP_LEN + 1)) == NULL) {
 		fprintf(stderr, "search: calloc\n");
-		return;
+		goto done;
 	}
 
 	rbytes = read(select_resp_pipe[0], resp, MAX_RESP_LEN);
@@ -3246,6 +3250,7 @@ search_do_resp(void)
 		free(s);
 	}
 done:
+	close(select_resp_pipe[0]);
 	free(resp);
 }
 
@@ -4662,7 +4667,8 @@ enum	{ SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_BAR_BORDER_WIDTH,
 int
 setconfvalue(char *selector, char *value, int flags)
 {
-	int i;
+	int	i;
+
 	switch (flags) {
 	case SWM_S_BAR_DELAY:
 		bar_delay = atoi(value);
@@ -6321,8 +6327,8 @@ main(int argc, char *argv[])
 	struct sigaction	sact;
 
 	start_argv = argv;
-	fprintf(stderr, "Welcome to scrotwm V%s cvs tag: %s\n",
-	    SWM_VERSION, cvstag);
+	fprintf(stderr, "Welcome to scrotwm V%s Build: %s\n",
+	    SCROTWM_VERSION, buildstr);
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		warnx("no locale support");