Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-26 06:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity

Support some space chars in serial commands (fs) (#2828)

Browse source
This commit is contained in:
Totoo 2025-10-17 17:05:27 +02:00 • committed by GitHub
parent 6782e12a15
commit 9f06ccf9ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
firmware/application/usb_serial_shell_filesystem.cpp
View file

@ -59,13 +59,23 @@ static bool report_on_error(BaseSequentialStream* chp, File::Result<uint64_t> er
return false;
}
std::string full_fn_from_args(int argc, char* argv[]) {
std::string full_fn;
for (int i = 0; i < argc; i++) {
if (i != 0)
full_fn += " ";
full_fn += argv[i];
}
return full_fn;
}
void cmd_sd_list_dir(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: ls /\r\n");
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
for (const auto& entry : std::filesystem::directory_iterator(path, "*")) {
if (std::filesystem::is_directory(entry.status())) {
@ -79,12 +89,12 @@ void cmd_sd_list_dir(BaseSequentialStream* chp, int argc, char* argv[]) {
}
void cmd_sd_unlink(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: unlink <path>\r\n");
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
auto error = delete_file(path);
if (report_on_error(chp, error)) return;
@ -92,12 +102,12 @@ void cmd_sd_unlink(BaseSequentialStream* chp, int argc, char* argv[]) {
}
void cmd_sd_mkdir(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: mkdir <path>\r\n");
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
if (std::filesystem::is_directory(path)) {
chprintf(chp, "directory already exists.\r\n");
@ -111,11 +121,11 @@ void cmd_sd_mkdir(BaseSequentialStream* chp, int argc, char* argv[]) {
}
void cmd_sd_filesize(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: filesize <path>\r\n");
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
FILINFO res;
auto stat = f_stat(path.tchar(), &res);
if (report_on_error(chp, stat)) return;
@ -125,7 +135,7 @@ void cmd_sd_filesize(BaseSequentialStream* chp, int argc, char* argv[]) {
}
void cmd_sd_open(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: fopen <path>\r\n");
return;
}
@ -135,7 +145,7 @@ void cmd_sd_open(BaseSequentialStream* chp, int argc, char* argv[]) {
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
shell_file = new File();
auto error = shell_file->open(path, false, true);
if (report_on_error(chp, error)) return;
@ -375,12 +385,12 @@ void cmd_sd_write_binary(BaseSequentialStream* chp, int argc, char* argv[]) {
}
void cmd_sd_crc32(BaseSequentialStream* chp, int argc, char* argv[]) {
if (argc != 1) {
if (argc < 1) {
chprintf(chp, "usage: crc32 <path>\r\n");
return;
}
auto path = path_from_string8(argv[0]);
auto path = path_from_string8((char*)full_fn_from_args(argc, argv).c_str());
File* crc_file = new File();
auto error = crc_file->open(path, true, false);
if (report_on_error(chp, error)) return;