Merge e578331192 into 91dac0e5a1

Merge pull request #1512 from ailin-nemui/shquote
missing shell quotes
2024-06-16 06:25:24 +00:00 · 2024-03-31 18:54:07 +02:00 · 2024-03-31 16:53:57 +00:00 · 2024-03-31 16:53:44 +00:00 · 2024-03-28 19:33:24 +01:00 · 2024-02-23 17:04:41 +01:00
5 changed files with 23 additions and 22 deletions
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@ -34,8 +34,8 @@
 #include "default-theme.h"

 GSList *themes;
-THEME_REC *current_theme;
-GHashTable *default_formats;
+THEME_REC *current_theme = NULL;
+GHashTable *default_formats = NULL;

 static int init_finished;
 static char *init_errors;
--- a/src/fe-fuzz/server.c
+++ b/src/fe-fuzz/server.c
@ -30,6 +30,7 @@
 #include <irssi/src/core/misc.h>
 #include <irssi/src/core/servers-setup.h>
 #include <irssi/src/core/rawlog.h>
+#include <irssi/src/core/network-openssl.h>
 #include <irssi/src/core/net-sendbuffer.h>

 #include <stddef.h>
--- a/src/fe-text/terminfo-core.c
+++ b/src/fe-text/terminfo-core.c
@ -35,8 +35,8 @@ int tigetflag();
 #define CAP_TYPE_STR	2

 typedef struct {
-        const char *ti_name; /* terminfo name */
-	const char *tc_name; /* termcap name */
+        char *ti_name; /* terminfo name */
+	char *tc_name; /* termcap name */
 	int type;
 	unsigned int offset;
 } TERMINFO_REC;
--- a/src/fe-text/terminfo-core.h
+++ b/src/fe-text/terminfo-core.h
@ -56,32 +56,32 @@ struct _TERM_REC {
        int width, height;

        /* Cursor movement */
-	const char *TI_smcup, *TI_rmcup, *TI_cup;
-	const char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1;
-        const char *TI_civis, *TI_cnorm;
+	char *TI_smcup, *TI_rmcup, *TI_cup;
+	char *TI_hpa, *TI_vpa, *TI_cub1, *TI_cuf1;
+        char *TI_civis, *TI_cnorm;

 	/* Scrolling */
-	const char *TI_csr, *TI_wind;
-	const char *TI_ri, *TI_rin, *TI_ind, *TI_indn;
-	const char *TI_il, *TI_il1, *TI_dl, *TI_dl1;
+	char *TI_csr, *TI_wind;
+	char *TI_ri, *TI_rin, *TI_ind, *TI_indn;
+	char *TI_il, *TI_il1, *TI_dl, *TI_dl1;

 	/* Clearing screen */
-	const char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */
+	char *TI_clear, *TI_ed; /* + *TI_dl, *TI_dl1; */

        /* Clearing to end of line */
-	const char *TI_el;
+	char *TI_el;

 	/* Repeating character */
-	const char *TI_rep;
+	char *TI_rep;

 	/* Colors */
 	int TI_colors; /* numbers of colors in TI_fg[] and TI_bg[] */
-	const char *TI_sgr0; /* turn off all attributes */
-	const char *TI_smul, *TI_rmul; /* underline on/off */
-	const char *TI_smso, *TI_rmso; /* standout on/off */
-	const char *TI_sitm, *TI_ritm; /* italic on/off */
-	const char *TI_bold, *TI_blink, *TI_rev;
-	const char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;
+	char *TI_sgr0; /* turn off all attributes */
+	char *TI_smul, *TI_rmul; /* underline on/off */
+	char *TI_smso, *TI_rmso; /* standout on/off */
+	char *TI_sitm, *TI_ritm; /* italic on/off */
+	char *TI_bold, *TI_blink, *TI_rev;
+	char *TI_setaf, *TI_setab, *TI_setf, *TI_setb;

        /* Colors - generated and dynamically allocated */
 	char **TI_fg, **TI_bg, *TI_normal;
@ -90,8 +90,8 @@ struct _TERM_REC {
        char *TI_bel;

 	/* Keyboard-transmit mode */
-	const char *TI_smkx;
-	const char *TI_rmkx;
+	char *TI_smkx;
+	char *TI_rmkx;

 	/* Terminal mode states */
 	int appkey_enabled;
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-DATE=`grep '^v' $1/NEWS | head -1`
+DATE=`grep '^v' "$1"/NEWS | head -1`
 VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
 case $VERSION_DATE in
  *xx)
Author	SHA1	Message	Date
Emil Engler	9cb4a8961a	Merge `e578331192` into `91dac0e5a1`	2024-03-31 18:54:07 +02:00
ailin-nemui	91dac0e5a1	Merge pull request #1512 from ailin-nemui/shquote missing shell quotes	2024-03-31 16:53:57 +00:00
ailin-nemui	aebc0667a6	Merge pull request #1515 from maflcko/patch-1 Update server.c: Add missing include	2024-03-31 16:53:44 +00:00
maflcko	cf6615a70e	Update server.c: Add missing include	2024-03-28 19:33:24 +01:00
Ailin Nemui	4dd57cf24e	missing shell quotes	2024-02-23 17:04:41 +01:00
Emil Engler	e578331192	fe-text: include the real tputs(3) from term.h This commit includes the real `tpus(3)` function from the appropriate `term.h` header file, if found. This commit is necessary to fix a compiler warning on Darwin.	2023-08-14 11:56:39 +02:00
Emil Engler	67d961676d	fe-text: remove const for better Darwin support This commit removes the `const` qualifier from certain member fields, as the Darwin version of several `<term.h>` related functions only accept a `char ` rather than a `const char `, thereby resulting in dozens of compiler warnings.	2023-08-14 11:53:34 +02:00
Emil Engler	47b7f5164a	build: fix linking error on arm64 Darwin Currently, it is not possible to build git master on Darwin, as seen in several issues reported previously. This commit fixes that issues, by initializing two variables to NULL. I have no idea, why this solves the linking error, as to my knowledge, global variables do not need to be initialized.	2023-08-14 11:22:50 +02:00