sled

чување df198a7c1f1c1372a0127434093c40421ede77f8
родитељ 7c142b66ae813aad538e7e1503c6a05d7b7dcb5a
Аутор: Страхиња Радић <sr@strahinja.org>
Датум:   Thu,  8 Aug 2024 10:59:10 +0200

patch/syntax.patch: Remove the update which should have been in master 
branch

Diffstat:
M
patch/syntax.patch
 | 
47
++++++++++-------------------------------------

измењених датотека: 1, додавања: 10(+), брисања: 37(-)
diff --git a/patch/syntax.patch b/patch/syntax.patch
@@ -1,6 +1,6 @@
-From c732f3fbd96087c89640584cf56b2ee293892629 Mon Sep 17 00:00:00 2001
+From 04d6bfdfa410e4089dafde7626020ddff7722c64 Mon Sep 17 00:00:00 2001
 From: Страхиња Радић <sr@strahinja.org>
-Date: Wed Aug  7 19:35:09 2024 UTC
+Date: Thu Aug  8 07:38:16 2024 UTC
 Subject: [PATCH] Add syntax highlighting
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,11 +12,11 @@ but gets the job done. TODO: Optimization.
  config.def.h  |    7+   0-
  draw.c        |  485+  29-
  draw.h        |   62+   6-
- sled.c        |   91+   7-
- 4 files changed, 645 insertions(+), 42 deletions(-)
+ sled.c        |   83+   3-
+ 4 files changed, 637 insertions(+), 38 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index a55be18ef..c732f3fbd 100644
+index 7c142b66a..04d6bfdfa 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -239,6 +239,13 @@ static const struct Key command_keys[] = {
@@ -34,7 +34,7 @@ index a55be18ef..c732f3fbd 100644
  	{.format    = "%s%s",
  	 .callback  = format_filename,
 diff --git a/draw.c b/draw.c
-index a55be18ef..c732f3fbd 100644
+index 7c142b66a..04d6bfdfa 100644
 --- a/draw.c
 +++ b/draw.c
 @@ -2,6 +2,7 @@
@@ -740,7 +740,7 @@ index a55be18ef..c732f3fbd 100644
  	}
  
 diff --git a/draw.h b/draw.h
-index a55be18ef..c732f3fbd 100644
+index 7c142b66a..04d6bfdfa 100644
 --- a/draw.h
 +++ b/draw.h
 @@ -37,17 +37,58 @@ enum {
@@ -863,7 +863,7 @@ index a55be18ef..c732f3fbd 100644
 +	const uint16_t sbg, const int ssi, const int sei, const uint16_t slfg,
 +	const uint16_t slbg);
 diff --git a/sled.c b/sled.c
-index a55be18ef..c732f3fbd 100644
+index 7c142b66a..04d6bfdfa 100644
 --- a/sled.c
 +++ b/sled.c
 @@ -67,6 +67,18 @@ extern const char* prompt_reread_dirty;
@@ -1046,34 +1046,7 @@ index a55be18ef..c732f3fbd 100644
  #ifdef __OpenBSD__
  	if (unveil(state.filename, "rwc") < 0)
  	{
-@@ -3054,6 +3128,8 @@ main(int argc, char** argv)
- 			}
- 			else /* rfn is relative */
- 			{
-+				size_t rfn_dir_len;
-+
- 				state.orig_real_filename
- 					= strndup(rfn, state.rfn_len);
- 				if (!state.orig_real_filename)
-@@ -3069,11 +3145,13 @@ main(int argc, char** argv)
- 					print_error(1, "Pathname too long");
- 					goto main_cleanup;
- 				}
--				*(temp - 1) = '/';
-+				*(temp - 1) = '/'; /* overwrite NUL */
-+				rfn_dir_len = temp - state.real_filename - 1;
- 				MEMCCPY_EXT(temp, state.real_filename, rfn,
--					limits[L_PATH_MAX] - state.rfn_len - 1,
--					temp);
--				state.rfn_len = temp - state.real_filename - 1;
-+					limits[L_PATH_MAX] - rfn_dir_len, temp);
-+				if (temp)
-+					state.rfn_len = temp
-+						- state.real_filename - 1;
- 			}
- 			free(rfn);
- 			rfn = NULL;
-@@ -3206,9 +3284,10 @@ main_skip_backups:
+@@ -3210,9 +3284,10 @@ main_skip_backups:
  
  init_termbox:
  	tb_init();
@@ -1087,7 +1060,7 @@ index a55be18ef..c732f3fbd 100644
  
  	while (state.running)
  	{
-@@ -3220,6 +3299,11 @@ init_termbox:
+@@ -3224,6 +3299,11 @@ init_termbox:
  			recalculate_size(&state);
  			state.recalculate_size = 0;
  		}