Skip to content

Commit

Permalink
libc/utsname: Only store version in RAM, use rodata for all others
Browse files Browse the repository at this point in the history
Signed-off-by: wangmingrong1 <[email protected]>
  • Loading branch information
W-M-R committed Oct 11, 2024
1 parent 1a30f30 commit ea25b30
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions libs/libc/misc/lib_utsname.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@
* Private Data
****************************************************************************/

static char g_sysname[] = "NuttX";
static char g_machine[] = CONFIG_ARCH;
static char g_release[] = CONFIG_VERSION_STRING;

#if defined(__DATE__) && defined(__TIME__)
#if defined(__DATE__) && defined(__TIME__) && \
!defined(CONFIG_LIBC_UNAME_DISABLE_TIMESTAMP) \
static char g_version[] = CONFIG_VERSION_BUILD " " __DATE__ " " __TIME__;

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-01)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-01)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-01)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (arm-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (arm-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / Linux (sim-02)

missing binary operator before token "static"

Check failure on line 56 in libs/libc/misc/lib_utsname.c

View workflow job for this annotation

GitHub Actions / msys2 (msys2)

missing binary operator before token "static"
#else
static char g_version[] = CONFIG_VERSION_BUILD;
Expand Down Expand Up @@ -97,15 +94,20 @@ int uname(FAR struct utsname *name)
{
int ret = 0;

/* Copy the strings. Assure that each is NUL terminated. */

strlcpy(name->sysname, "NuttX", sizeof(name->sysname));

/* Get the hostname */

ret = gethostname(name->nodename, HOST_NAME_MAX);
name->nodename[HOST_NAME_MAX - 1] = '\0';

strlcpy(name->sysname, g_sysname, sizeof(name->sysname));
strlcpy(name->release, g_release, sizeof(name->release));
strlcpy(name->version, g_version, sizeof(name->version));
strlcpy(name->machine, g_machine, sizeof(name->machine));
strlcpy(name->release, CONFIG_VERSION_STRING, sizeof(name->release));

strlcpy(name->version, g_version, sizeof(name->version));

strlcpy(name->machine, CONFIG_ARCH, sizeof(name->machine));

return ret;
}

0 comments on commit ea25b30

Please sign in to comment.