mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
fc25af7cd7
Berry's downloaded default/berry.c uses CRLF line endings, while the local NuttX patch was LF. Fresh Linux and CMake builds failed when patch saw the line-ending mismatch. Regenerate the local Berry patch against the pinned upstream CRLF source and apply it directly in both Make and CMake fetch paths. This keeps the integration working until the Berry-side change is merged upstream and the pinned commit can be updated. Signed-off-by: Frederick Blais <fred_blais5@hotmail.com>
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
diff --git a/default/berry.c b/default/berry.c
|
|
index 203773f..0df2a99 100644
|
|
--- a/default/berry.c
|
|
+++ b/default/berry.c
|
|
@@ -19,7 +19,9 @@
|
|
#endif
|
|
|
|
/* detect operating system name */
|
|
-#if defined(__linux)
|
|
+#if defined(__NuttX__)
|
|
+ #define OS_NAME "NuttX"
|
|
+#elif defined(__linux)
|
|
#define OS_NAME "Linux"
|
|
#elif defined(__unix)
|
|
#define OS_NAME "Unix"
|
|
@@ -98,7 +100,7 @@
|
|
struct arg_opts {
|
|
int idx;
|
|
const char *pattern;
|
|
- const char *optarg;
|
|
+ const char *optvalue;
|
|
const char *errarg;
|
|
const char *src;
|
|
const char *dst;
|
|
@@ -143,10 +145,10 @@ static int arg_getopt(struct arg_opts *opt, int argc, char *argv[])
|
|
/* the '?' indicates an optional argument after the option */
|
|
if (++opt->idx < argc && res != NULL
|
|
&& res[1] == '?' && *argv[opt->idx] != '-') {
|
|
- opt->optarg = argv[opt->idx++]; /* save the argument */
|
|
+ opt->optvalue = argv[opt->idx++]; /* save the argument */
|
|
return *res;
|
|
}
|
|
- opt->optarg = NULL;
|
|
+ opt->optvalue = NULL;
|
|
opt->errarg = arg;
|
|
return res != NULL ? *res : '?';
|
|
}
|
|
@@ -267,16 +269,16 @@ static int parse_arg(struct arg_opts *opt, int argc, char *argv[])
|
|
case 's': args |= arg_s; break;
|
|
case 'm':
|
|
args |= arg_m;
|
|
- opt->modulepath = opt->optarg;
|
|
+ opt->modulepath = opt->optvalue;
|
|
break;
|
|
case '?': return args | arg_err;
|
|
case 'c':
|
|
args |= arg_c;
|
|
- opt->src = opt->optarg;
|
|
+ opt->src = opt->optvalue;
|
|
break;
|
|
case 'o':
|
|
args |= arg_o;
|
|
- opt->dst = opt->optarg;
|
|
+ opt->dst = opt->optvalue;
|
|
break;
|
|
default:
|
|
break;
|