mirror of
https://github.com/LuckfoxTECH/luckfox-pico.git
synced 2026-01-18 03:28:19 +01:00
update:add luckfox-pico Ultra support
This commit is contained in:
committed by
luckfox-eng33
parent
1e160dee55
commit
d3153ac97e
@@ -0,0 +1,81 @@
|
||||
From 82ecf5badb818c40fba1e7ada16d53189dfe816b Mon Sep 17 00:00:00 2001
|
||||
From: eng33 <eng33@luckfox.com>
|
||||
Date: Tue, 30 Jan 2024 16:25:34 +0800
|
||||
Subject: [PATCH 1/2] Fixed header file errors
|
||||
|
||||
---
|
||||
client/main.c | 2 +-
|
||||
client/player.c | 2 +-
|
||||
src/shared/shell.c | 2 +-
|
||||
tools/btmgmt.c | 2 +-
|
||||
tools/obexctl.c | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/client/main.c b/client/main.c
|
||||
index 1df94f0..2e19538 100644
|
||||
--- a/client/main.c
|
||||
+++ b/client/main.c
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
-#include <wordexp.h>
|
||||
+#include <android/compat/wordexp.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
diff --git a/client/player.c b/client/player.c
|
||||
index 0c59db6..e807ae0 100644
|
||||
--- a/client/player.c
|
||||
+++ b/client/player.c
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/uio.h>
|
||||
-#include <wordexp.h>
|
||||
+#include <android/compat/wordexp.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
diff --git a/src/shared/shell.c b/src/shared/shell.c
|
||||
index dfda812..86eda9d 100644
|
||||
--- a/src/shared/shell.c
|
||||
+++ b/src/shared/shell.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <stdbool.h>
|
||||
#include <signal.h>
|
||||
#include <sys/signalfd.h>
|
||||
-#include <wordexp.h>
|
||||
+#include <android/compat/wordexp.h>
|
||||
#include <getopt.h>
|
||||
|
||||
#include <readline/readline.h>
|
||||
diff --git a/tools/btmgmt.c b/tools/btmgmt.c
|
||||
index ebef388..0cd8700 100644
|
||||
--- a/tools/btmgmt.c
|
||||
+++ b/tools/btmgmt.c
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <poll.h>
|
||||
#include <getopt.h>
|
||||
#include <stdbool.h>
|
||||
-#include <wordexp.h>
|
||||
+#include <android/compat/wordexp.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "lib/bluetooth.h"
|
||||
diff --git a/tools/obexctl.c b/tools/obexctl.c
|
||||
index 56a7691..e8aed6a 100644
|
||||
--- a/tools/obexctl.c
|
||||
+++ b/tools/obexctl.c
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
-#include <wordexp.h>
|
||||
+#include <android/compat/wordexp.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <glib.h>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
424
sysdrv/tools/board/buildroot/hcitool_patch/0002-Fix-build-errors.patch
Executable file
424
sysdrv/tools/board/buildroot/hcitool_patch/0002-Fix-build-errors.patch
Executable file
@@ -0,0 +1,424 @@
|
||||
--- a/src/shared/shell.c 2024-05-13 13:59:50.477347842 +0800
|
||||
+++ b/src/shared/shell.c 2024-05-13 14:11:43.277134799 +0800
|
||||
@@ -13,6 +13,9 @@
|
||||
#endif
|
||||
|
||||
#define _GNU_SOURCE
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/wait.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <syslog.h>
|
||||
@@ -24,6 +27,10 @@
|
||||
#include <sys/signalfd.h>
|
||||
#include <android/compat/wordexp.h>
|
||||
#include <getopt.h>
|
||||
+#include <stdint.h>
|
||||
+#include <string.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <paths.h>
|
||||
|
||||
#include <readline/readline.h>
|
||||
#include <readline/history.h>
|
||||
@@ -46,6 +53,11 @@
|
||||
printf(COLOR_BLUE "%s %-*s " COLOR_OFF "%s\n", \
|
||||
cmd, (int)(CMD_LENGTH - strlen(cmd)), "", desc)
|
||||
|
||||
+/*
|
||||
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
|
||||
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
|
||||
+ */
|
||||
+#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
|
||||
struct bt_shell_env {
|
||||
char *name;
|
||||
void *value;
|
||||
@@ -88,6 +100,20 @@
|
||||
static void shell_print_menu(void);
|
||||
static void shell_print_menu_zsh_complete(void);
|
||||
|
||||
+static void * _reallocarray(void *optr, size_t nmemb, size_t size)
|
||||
+{
|
||||
+
|
||||
+ if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
|
||||
+ nmemb > 0 && SIZE_MAX / nmemb < size) {
|
||||
+ errno = ENOMEM;
|
||||
+ return (NULL);
|
||||
+ }
|
||||
+ return (realloc(optr, size * nmemb));
|
||||
+}
|
||||
+
|
||||
+static int we_askshell(const char *, wordexp_t *, int);
|
||||
+static int we_check(const char *);
|
||||
+
|
||||
static void cmd_version(int argc, char *argv[])
|
||||
{
|
||||
bt_shell_printf("Version %s\n", VERSION);
|
||||
@@ -1416,3 +1442,367 @@
|
||||
|
||||
return env->value;
|
||||
}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * wordexp --
|
||||
+ * Perform shell word expansion on `words' and place the resulting list
|
||||
+ * of words in `we'. See wordexp(3).
|
||||
+ *
|
||||
+ * Specified by IEEE Std. 1003.1-2001.
|
||||
+ */
|
||||
+int
|
||||
+wordexp(const char * __restrict words, wordexp_t * __restrict we, int flags)
|
||||
+{
|
||||
+ int error;
|
||||
+
|
||||
+ if (flags & WRDE_REUSE)
|
||||
+ wordfree(we);
|
||||
+ if ((flags & WRDE_APPEND) == 0) {
|
||||
+ we->we_wordc = 0;
|
||||
+ we->we_wordv = NULL;
|
||||
+ we->we_strings = NULL;
|
||||
+ we->we_nbytes = 0;
|
||||
+ }
|
||||
+ if ((error = we_check(words)) != 0) {
|
||||
+ wordfree(we);
|
||||
+ return (error);
|
||||
+ }
|
||||
+ if ((error = we_askshell(words, we, flags)) != 0) {
|
||||
+ wordfree(we);
|
||||
+ return (error);
|
||||
+ }
|
||||
+ return (0);
|
||||
+}
|
||||
+
|
||||
+static size_t
|
||||
+weread_fully(int fd, char *buffer, size_t len)
|
||||
+{
|
||||
+ size_t done;
|
||||
+ ssize_t nread;
|
||||
+
|
||||
+ done = 0;
|
||||
+ do {
|
||||
+ nread = read(fd, buffer + done, len - done);
|
||||
+ if (nread == -1 && errno == EINTR)
|
||||
+ continue;
|
||||
+ if (nread <= 0)
|
||||
+ break;
|
||||
+ done += nread;
|
||||
+ } while (done != len);
|
||||
+ return done;
|
||||
+}
|
||||
+
|
||||
+static bool
|
||||
+wewrite_fully(int fd, const char *buffer, size_t len)
|
||||
+{
|
||||
+ size_t done;
|
||||
+ ssize_t nwritten;
|
||||
+
|
||||
+ done = 0;
|
||||
+ do {
|
||||
+ nwritten = write(fd, buffer + done, len - done);
|
||||
+ if (nwritten == -1 && errno == EINTR)
|
||||
+ continue;
|
||||
+ if (nwritten <= 0)
|
||||
+ return (false);
|
||||
+ done += nwritten;
|
||||
+ } while (done != len);
|
||||
+ return (true);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * we_askshell --
|
||||
+ * Use the `freebsd_wordexp' /bin/sh builtin function to do most of the
|
||||
+ * work in expanding the word string. This function is complicated by
|
||||
+ * memory management.
|
||||
+ */
|
||||
+static int
|
||||
+we_askshell(const char *words, wordexp_t *we, int flags)
|
||||
+{
|
||||
+ int pdesw[2]; /* Pipe for writing words */
|
||||
+ int pdes[2]; /* Pipe for reading output */
|
||||
+ char wfdstr[sizeof(int) * 3 + 1];
|
||||
+ char buf[35]; /* Buffer for byte and word count */
|
||||
+ size_t nwords, nbytes; /* Number of words, bytes from child */
|
||||
+ size_t i; /* Handy integer */
|
||||
+ size_t sofs; /* Offset into we->we_strings */
|
||||
+ size_t vofs; /* Offset into we->we_wordv */
|
||||
+ pid_t pid; /* Process ID of child */
|
||||
+ pid_t wpid; /* waitpid return value */
|
||||
+ int status; /* Child exit status */
|
||||
+ int error; /* Our return value */
|
||||
+ int serrno; /* errno to return */
|
||||
+ char *np, *p; /* Handy pointers */
|
||||
+ char *nstrings; /* Temporary for realloc() */
|
||||
+ char **nwv; /* Temporary for realloc() */
|
||||
+ sigset_t newsigblock, oldsigblock;
|
||||
+ const char *ifs;
|
||||
+
|
||||
+ serrno = errno;
|
||||
+ ifs = getenv("IFS");
|
||||
+
|
||||
+ if (pipe2(pdesw, O_CLOEXEC) < 0)
|
||||
+ return (WRDE_NOSPACE); /* XXX */
|
||||
+ snprintf(wfdstr, sizeof(wfdstr), "%d", pdesw[0]);
|
||||
+ if (pipe2(pdes, O_CLOEXEC) < 0) {
|
||||
+ close(pdesw[0]);
|
||||
+ close(pdesw[1]);
|
||||
+ return (WRDE_NOSPACE); /* XXX */
|
||||
+ }
|
||||
+ (void)sigemptyset(&newsigblock);
|
||||
+ (void)sigaddset(&newsigblock, SIGCHLD);
|
||||
+ (void)sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
|
||||
+ if ((pid = fork()) < 0) {
|
||||
+ serrno = errno;
|
||||
+ close(pdesw[0]);
|
||||
+ close(pdesw[1]);
|
||||
+ close(pdes[0]);
|
||||
+ close(pdes[1]);
|
||||
+ (void)sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
|
||||
+ errno = serrno;
|
||||
+ return (WRDE_NOSPACE); /* XXX */
|
||||
+ }
|
||||
+ else if (pid == 0) {
|
||||
+ /*
|
||||
+ * We are the child; make /bin/sh expand `words'.
|
||||
+ */
|
||||
+ (void)sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
|
||||
+ if ((pdes[1] != STDOUT_FILENO ?
|
||||
+ dup2(pdes[1], STDOUT_FILENO) :
|
||||
+ fcntl(pdes[1], F_SETFD, 0)) < 0)
|
||||
+ _exit(1);
|
||||
+ if (fcntl(pdesw[0], F_SETFD, 0) < 0)
|
||||
+ _exit(1);
|
||||
+ execl(_PATH_BSHELL, "sh", flags & WRDE_UNDEF ? "-u" : "+u",
|
||||
+ "-c", "IFS=$1;eval \"$2\";"
|
||||
+ "freebsd_wordexp -f \"$3\" ${4:+\"$4\"}",
|
||||
+ "",
|
||||
+ ifs != NULL ? ifs : " \t\n",
|
||||
+ flags & WRDE_SHOWERR ? "" : "exec 2>/dev/null",
|
||||
+ wfdstr,
|
||||
+ flags & WRDE_NOCMD ? "-p" : "",
|
||||
+ (char *)NULL);
|
||||
+ _exit(1);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * We are the parent; write the words.
|
||||
+ */
|
||||
+ close(pdes[1]);
|
||||
+ close(pdesw[0]);
|
||||
+ if (!wewrite_fully(pdesw[1], words, strlen(words))) {
|
||||
+ close(pdesw[1]);
|
||||
+ error = WRDE_SYNTAX;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+ close(pdesw[1]);
|
||||
+ /*
|
||||
+ * Read the output of the shell wordexp function,
|
||||
+ * which is a byte indicating that the words were parsed successfully,
|
||||
+ * a 64-bit hexadecimal word count, a dummy byte, a 64-bit hexadecimal
|
||||
+ * byte count (not including terminating null bytes), followed by the
|
||||
+ * expanded words separated by nulls.
|
||||
+ */
|
||||
+ switch (weread_fully(pdes[0], buf, 34)) {
|
||||
+ case 1:
|
||||
+ error = buf[0] == 'C' ? WRDE_CMDSUB : WRDE_BADVAL;
|
||||
+ serrno = errno;
|
||||
+ goto cleanup;
|
||||
+ case 34:
|
||||
+ break;
|
||||
+ default:
|
||||
+ error = WRDE_SYNTAX;
|
||||
+ serrno = errno;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+ buf[17] = '\0';
|
||||
+ nwords = strtol(buf + 1, NULL, 16);
|
||||
+ buf[34] = '\0';
|
||||
+ nbytes = strtol(buf + 18, NULL, 16) + nwords;
|
||||
+
|
||||
+ /*
|
||||
+ * Allocate or reallocate (when flags & WRDE_APPEND) the word vector
|
||||
+ * and string storage buffers for the expanded words we're about to
|
||||
+ * read from the child.
|
||||
+ */
|
||||
+ sofs = we->we_nbytes;
|
||||
+ vofs = we->we_wordc;
|
||||
+ if ((flags & (WRDE_DOOFFS|WRDE_APPEND)) == (WRDE_DOOFFS|WRDE_APPEND))
|
||||
+ vofs += we->we_offs;
|
||||
+ we->we_wordc += nwords;
|
||||
+ we->we_nbytes += nbytes;
|
||||
+ if ((nwv = _reallocarray(we->we_wordv, (we->we_wordc + 1 +
|
||||
+ (flags & WRDE_DOOFFS ? we->we_offs : 0)),
|
||||
+ sizeof(char *))) == NULL) {
|
||||
+ error = WRDE_NOSPACE;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+ we->we_wordv = nwv;
|
||||
+ if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) {
|
||||
+ error = WRDE_NOSPACE;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+ for (i = 0; i < vofs; i++)
|
||||
+ if (we->we_wordv[i] != NULL)
|
||||
+ we->we_wordv[i] += nstrings - we->we_strings;
|
||||
+ we->we_strings = nstrings;
|
||||
+
|
||||
+ if (weread_fully(pdes[0], we->we_strings + sofs, nbytes) != nbytes) {
|
||||
+ error = WRDE_NOSPACE; /* abort for unknown reason */
|
||||
+ serrno = errno;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+
|
||||
+ error = 0;
|
||||
+cleanup:
|
||||
+ close(pdes[0]);
|
||||
+ do
|
||||
+ wpid = waitpid(pid, &status, 0);
|
||||
+ while (wpid < 0 && errno == EINTR);
|
||||
+ (void)sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
|
||||
+ if (error != 0) {
|
||||
+ errno = serrno;
|
||||
+ return (error);
|
||||
+ }
|
||||
+ if (wpid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
|
||||
+ return (WRDE_NOSPACE); /* abort for unknown reason */
|
||||
+
|
||||
+ /*
|
||||
+ * Break the null-terminated expanded word strings out into
|
||||
+ * the vector.
|
||||
+ */
|
||||
+ if (vofs == 0 && flags & WRDE_DOOFFS)
|
||||
+ while (vofs < we->we_offs)
|
||||
+ we->we_wordv[vofs++] = NULL;
|
||||
+ p = we->we_strings + sofs;
|
||||
+ while (nwords-- != 0) {
|
||||
+ we->we_wordv[vofs++] = p;
|
||||
+ if ((np = memchr(p, '\0', nbytes)) == NULL)
|
||||
+ return (WRDE_NOSPACE); /* XXX */
|
||||
+ nbytes -= np - p + 1;
|
||||
+ p = np + 1;
|
||||
+ }
|
||||
+ we->we_wordv[vofs] = NULL;
|
||||
+
|
||||
+ return (0);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * we_check --
|
||||
+ * Check that the string contains none of the following unquoted
|
||||
+ * special characters: <newline> |&;<>(){}
|
||||
+ * This mainly serves for {} which are normally legal in sh.
|
||||
+ * It deliberately does not attempt to model full sh syntax.
|
||||
+ */
|
||||
+static int
|
||||
+we_check(const char *words)
|
||||
+{
|
||||
+ char c;
|
||||
+ /* Saw \ or $, possibly not special: */
|
||||
+ bool quote = false, dollar = false;
|
||||
+ /* Saw ', ", ${, ` or $(, possibly not special: */
|
||||
+ bool have_sq = false, have_dq = false, have_par_begin = false;
|
||||
+ bool have_cmd = false;
|
||||
+ /* Definitely saw a ', ", ${, ` or $(, need a closing character: */
|
||||
+ bool need_sq = false, need_dq = false, need_par_end = false;
|
||||
+ bool need_cmd_old = false, need_cmd_new = false;
|
||||
+
|
||||
+ while ((c = *words++) != '\0') {
|
||||
+ switch (c) {
|
||||
+ case '\\':
|
||||
+ quote = !quote;
|
||||
+ continue;
|
||||
+ case '$':
|
||||
+ if (quote)
|
||||
+ quote = false;
|
||||
+ else
|
||||
+ dollar = !dollar;
|
||||
+ continue;
|
||||
+ case '\'':
|
||||
+ if (!quote && !have_sq && !have_dq)
|
||||
+ need_sq = true;
|
||||
+ else
|
||||
+ need_sq = false;
|
||||
+ have_sq = true;
|
||||
+ break;
|
||||
+ case '"':
|
||||
+ if (!quote && !have_sq && !have_dq)
|
||||
+ need_dq = true;
|
||||
+ else
|
||||
+ need_dq = false;
|
||||
+ have_dq = true;
|
||||
+ break;
|
||||
+ case '`':
|
||||
+ if (!quote && !have_sq && !have_cmd)
|
||||
+ need_cmd_old = true;
|
||||
+ else
|
||||
+ need_cmd_old = false;
|
||||
+ have_cmd = true;
|
||||
+ break;
|
||||
+ case '{':
|
||||
+ if (!quote && !dollar && !have_sq && !have_dq &&
|
||||
+ !have_cmd)
|
||||
+ return (WRDE_BADCHAR);
|
||||
+ if (dollar) {
|
||||
+ if (!quote && !have_sq)
|
||||
+ need_par_end = true;
|
||||
+ have_par_begin = true;
|
||||
+ }
|
||||
+ break;
|
||||
+ case '}':
|
||||
+ if (!quote && !have_sq && !have_dq && !have_par_begin &&
|
||||
+ !have_cmd)
|
||||
+ return (WRDE_BADCHAR);
|
||||
+ need_par_end = false;
|
||||
+ break;
|
||||
+ case '(':
|
||||
+ if (!quote && !dollar && !have_sq && !have_dq &&
|
||||
+ !have_cmd)
|
||||
+ return (WRDE_BADCHAR);
|
||||
+ if (dollar) {
|
||||
+ if (!quote && !have_sq)
|
||||
+ need_cmd_new = true;
|
||||
+ have_cmd = true;
|
||||
+ }
|
||||
+ break;
|
||||
+ case ')':
|
||||
+ if (!quote && !have_sq && !have_dq && !have_cmd)
|
||||
+ return (WRDE_BADCHAR);
|
||||
+ need_cmd_new = false;
|
||||
+ break;
|
||||
+ case '|': case '&': case ';': case '<': case '>': case '\n':
|
||||
+ if (!quote && !have_sq && !have_dq && !have_cmd)
|
||||
+ return (WRDE_BADCHAR);
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ quote = dollar = false;
|
||||
+ }
|
||||
+ if (quote || dollar || need_sq || need_dq || need_par_end ||
|
||||
+ need_cmd_old || need_cmd_new)
|
||||
+ return (WRDE_SYNTAX);
|
||||
+
|
||||
+ return (0);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * wordfree --
|
||||
+ * Free the result of wordexp(). See wordexp(3).
|
||||
+ *
|
||||
+ * Specified by IEEE Std. 1003.1-2001.
|
||||
+ */
|
||||
+void
|
||||
+wordfree(wordexp_t *we)
|
||||
+{
|
||||
+
|
||||
+ if (we == NULL)
|
||||
+ return;
|
||||
+ free(we->we_wordv);
|
||||
+ free(we->we_strings);
|
||||
+ we->we_wordv = NULL;
|
||||
+ we->we_strings = NULL;
|
||||
+ we->we_nbytes = 0;
|
||||
+ we->we_wordc = 0;
|
||||
+}
|
||||
97
sysdrv/tools/board/buildroot/hcitool_patch/0003-fix-compat-wordexp.patch
Executable file
97
sysdrv/tools/board/buildroot/hcitool_patch/0003-fix-compat-wordexp.patch
Executable file
@@ -0,0 +1,97 @@
|
||||
--- a/android/compat/wordexp.h 2024-05-13 13:59:50.667347786 +0800
|
||||
+++ b/android/compat/wordexp.h 2024-05-13 14:11:43.377135089 +0800
|
||||
@@ -1,31 +1,78 @@
|
||||
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
-/*
|
||||
+/*-
|
||||
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
||||
*
|
||||
- * BlueZ - Bluetooth protocol stack for Linux
|
||||
+ * Copyright (c) 2002 Tim J. Robbins.
|
||||
+ * All rights reserved.
|
||||
*
|
||||
- * Copyright (C) 1991-2013 Free Software Foundation, Inc.
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
||||
+ * modification, are permitted provided that the following conditions
|
||||
+ * are met:
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer in the
|
||||
+ * documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
+ * SUCH DAMAGE.
|
||||
*
|
||||
+ * $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _WORDEXP_H_
|
||||
-#define _WORDEXP_H_
|
||||
+#define _WORDEXP_H_
|
||||
|
||||
-#define WRDE_NOCMD 0
|
||||
+#include <sys/types.h>
|
||||
+#include <stdlib.h>
|
||||
|
||||
typedef struct {
|
||||
- size_t we_wordc;
|
||||
- char **we_wordv;
|
||||
- size_t we_offs;
|
||||
+ size_t we_wordc; /* count of words matched */
|
||||
+ char **we_wordv; /* pointer to list of words */
|
||||
+ size_t we_offs; /* slots to reserve in we_wordv */
|
||||
+ char *we_strings; /* storage for wordv strings */
|
||||
+ size_t we_nbytes; /* size of we_strings */
|
||||
} wordexp_t;
|
||||
|
||||
-static inline int wordexp(const char *c, wordexp_t *w, int _i)
|
||||
-{
|
||||
- return -1;
|
||||
-}
|
||||
+/*
|
||||
+ * Flags for wordexp().
|
||||
+ */
|
||||
+#define WRDE_APPEND 0x1 /* append to previously generated */
|
||||
+#define WRDE_DOOFFS 0x2 /* we_offs member is valid */
|
||||
+#define WRDE_NOCMD 0x4 /* disallow command substitution */
|
||||
+#define WRDE_REUSE 0x8 /* reuse wordexp_t */
|
||||
+#define WRDE_SHOWERR 0x10 /* don't redirect stderr to /dev/null */
|
||||
+#define WRDE_UNDEF 0x20 /* disallow undefined shell vars */
|
||||
|
||||
-static inline void wordfree(wordexp_t *__wordexp)
|
||||
-{
|
||||
-}
|
||||
+/*
|
||||
+ * Return values from wordexp().
|
||||
+ */
|
||||
+#define WRDE_BADCHAR 1 /* unquoted special character */
|
||||
+#define WRDE_BADVAL 2 /* undefined variable */
|
||||
+#define WRDE_CMDSUB 3 /* command substitution not allowed */
|
||||
+#define WRDE_NOSPACE 4 /* no memory for result */
|
||||
+#if __XSI_VISIBLE
|
||||
+#define WRDE_NOSYS 5 /* obsolete, reserved */
|
||||
+#endif
|
||||
+#define WRDE_SYNTAX 6 /* shell syntax error */
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
|
||||
+int wordexp(const char * __restrict, wordexp_t * __restrict, int);
|
||||
+void wordfree(wordexp_t *);
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
#endif
|
||||
+
|
||||
+#endif /* !_WORDEXP_H_ */
|
||||
Reference in New Issue
Block a user