EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add changes to nvram from #254/#266, resolves problems on older wap54g, thx for report

Browse Source 
SVN-Revision: 3089
This commit is contained in:
Waldemar Brodkorb 2006-01-31 15:22:43 +00:00
parent 37a9e05efb
commit b0a0f0ebe4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openwrt/package/nvram/src/main.c
View File

@ -26,6 +26,15 @@ usage(void)
exit(0);
}
/* hack for some PMON default nvram values which have '\r' appended */
void
puts_trim_cr(char *str)
{
int len= strlen(str);
if (len && (str[len-1] == '\r')) len--;
printf("%.*s\n", len, str);
}
/* NVRAM utility */
int
main(int argc, char **argv)
@ -44,8 +53,9 @@ main(int argc, char **argv)
for (; *argv; argv++) {
if (!strncmp(*argv, "get", 3)) {
if (*++argv) {
if ((value = nvram_get(*argv)))
puts(value);
if ((value = nvram_get(*argv))) {
puts_trim_cr(value);
}
}
}
else if (!strncmp(*argv, "set", 3)) {
@ -66,7 +76,7 @@ main(int argc, char **argv)
!strncmp(*argv, "getall", 6)) {
nvram_getall(buf, sizeof(buf));
for (name = buf; *name; name += strlen(name) + 1)
puts(name);
puts_trim_cr(name);
size = sizeof(struct nvram_header) + (int) name - (int) buf;
fprintf(stderr, "size: %d bytes (%d left)\n", size, NVRAM_SPACE - size);
}