1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-30 18:47:45 +00:00

Ports/mrsh: Fix workdir, remove or upgrade patches

Also removes mrsh from the list of ports missing descriptions. I tried
to be descriptive about the patches, but as I picked this port up from
someone else, I'm not 100% sure how to best explain the patches.
This commit is contained in:
EWouters 2022-04-12 18:08:50 +02:00 committed by Linus Groh
parent 020235a841
commit a07e12609e
13 changed files with 184 additions and 263 deletions

View file

@ -0,0 +1,48 @@
From 7d050176ada352b563e551041999d0783475ad13 Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Wed, 4 May 2022 16:50:45 +0200
Subject: [PATCH 4/4] `glob.h` is missing so we disable glob
---
shell/word.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/shell/word.c b/shell/word.c
index df274b7..dd94965 100644
--- a/shell/word.c
+++ b/shell/word.c
@@ -1,7 +1,9 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <ctype.h>
+#ifndef __serenity__
#include <glob.h>
+#endif
#include <mrsh/buffer.h>
#include <pwd.h>
#include <stdbool.h>
@@ -339,10 +341,13 @@ bool expand_pathnames(struct mrsh_array *expanded,
for (size_t i = 0; i < fields->len; ++i) {
const struct mrsh_word *field = fields->data[i];
+#ifndef __serenity__
char *pattern = word_to_pattern(field);
if (pattern == NULL) {
+#endif
mrsh_array_add(expanded, mrsh_word_str(field));
continue;
+#ifndef __serenity__
}
glob_t glob_buf;
@@ -361,6 +366,7 @@ bool expand_pathnames(struct mrsh_array *expanded,
}
free(pattern);
+#endif
}
return true;
--
2.32.0 (Apple Git-132)