kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #18424 from benpicco/ncget-convenience

Browse Source 
sys/shell: ncget: convenience improvements
This commit is contained in:
chrysn 2022-08-31 23:40:35 +02:00 committed by GitHub
commit 7f64521c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/Makefile.dep
View File

@ -323,6 +323,10 @@ ifneq (,$(filter shell_commands,$(USEMODULE)))
USEMODULE += netutils
endif
ifneq (,$(filter nanocoap_vfs,$(USEMODULE)))
USEMODULE += vfs_util
endif
ifneq (,$(filter nimble_netif,$(USEMODULE)))
USEMODULE += nimble_scanner
USEMODULE += nimble_scanlist

16
sys/shell/commands/sc_nanocoap_vfs.c
View File

@ -27,6 +27,14 @@
#include "net/nanocoap_vfs.h"
#include "shell.h"
#include "vfs_default.h"
#include "vfs_util.h"
/**
* @brief Default download location for ncget
*/
#ifndef CONFIG_NCGET_DEFAULT_DATA_DIR
#define CONFIG_NCGET_DEFAULT_DATA_DIR VFS_DEFAULT_DATA
#endif
struct dir_list_ctx {
char *buf;
@ -96,7 +104,7 @@ static int _nanocoap_get_handler(int argc, char **argv)
if (argc < 2) {
printf("Usage: %s <url> [destination]\n", argv[0]);
printf("Default destination: %s\n", VFS_DEFAULT_DATA);
printf("Default destination: %s\n", CONFIG_NCGET_DEFAULT_DATA_DIR);
return -EINVAL;
}
@ -115,7 +123,7 @@ static int _nanocoap_get_handler(int argc, char **argv)
return -EINVAL;
}
if (snprintf(buffer, sizeof(buffer), "%s%s",
VFS_DEFAULT_DATA, dst) >= (int)sizeof(buffer)) {
CONFIG_NCGET_DEFAULT_DATA_DIR, dst) >= (int)sizeof(buffer)) {
printf("Output file path too long\n");
return -ENOBUFS;
}
@ -123,9 +131,9 @@ static int _nanocoap_get_handler(int argc, char **argv)
} else {
char *filename = strrchr(url, '/');
dst = argv[2];
if (_is_dir(dst) && filename) {
if (vfs_is_dir(dst) > 0 && filename) {
if (snprintf(buffer, sizeof(buffer), "%s%s",
dst, filename + 1) >= (int)sizeof(buffer)) {
dst, filename) >= (int)sizeof(buffer)) {
printf("Output file path too long\n");
return -ENOBUFS;
}