funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

check exec return code for USB mounting

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-01-07 18:46:45 +01:00
parent 14ca315440
commit 5f1db4952f
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RetroFE/Source/Menu/MenuMode.cpp
View File

@ -1,4 +1,5 @@
#include "MenuMode.h" #include "MenuMode.h"
#include "../Utility/Utils.h"
#include <iostream> #include <iostream>
#include "../SDL.h" #include "../SDL.h"
@ -882,10 +883,18 @@ void MenuMode::launch( )
menu_screen_refresh(menuItem, prevItem, scroll, menu_confirmation, 1); menu_screen_refresh(menuItem, prevItem, scroll, menu_confirmation, 1);
/// ----- Shell cmd ---- /// ----- Shell cmd ----
fp = popen(usb_mounted?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT, "r"); /*fp = popen(usb_mounted?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT, "r");
if (fp == NULL) { if (fp == NULL) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd); MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
} }
else{
usb_mounted = !usb_mounted;
}*/
bool res = Utils::executeRawPath(usb_mounted?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT);
if (!res) {
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
}
else{ else{
usb_mounted = !usb_mounted; usb_mounted = !usb_mounted;
} }

23
RetroFE/Source/Utility/Utils.cpp
View File

@ -20,6 +20,7 @@
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
#include <cstdlib>
#include <dirent.h> #include <dirent.h>
#include <locale> #include <locale>
#include <list> #include <list>
@ -267,6 +268,28 @@ std::string Utils::trimEnds(std::string str)
return str; return str;
} }
bool Utils::executeRawPath(const char *shellCmd)
{
bool retVal = false;
Logger::write(Logger::ZONE_INFO, "Utils", "Attempting to launch: " + std::string(shellCmd));
std::string executionString = "exec " + std::string(shellCmd);
printf("Running: %s\n", executionString.c_str());
if(system(executionString.c_str()) != 0)
{
Logger::write(Logger::ZONE_ERROR, "Utils", "Failed to run: " + std::string(shellCmd));
}
else
{
retVal = true;
}
Logger::write(Logger::ZONE_INFO, "Utils", "Completed");
return retVal;
}
int Utils::termfix(uint32_t ttyId){ int Utils::termfix(uint32_t ttyId){
// Init tty file path // Init tty file path
char ttyFilePath[100]; char ttyFilePath[100];

2
RetroFE/Source/Utility/Utils.h
View File

@ -44,6 +44,8 @@ public:
static std::string combinePath(std::string path1, std::string path2, std::string path3, std::string path4); static std::string combinePath(std::string path1, std::string path2, std::string path3, std::string path4);
static std::string combinePath(std::string path1, std::string path2, std::string path3, std::string path4, std::string path5); static std::string combinePath(std::string path1, std::string path2, std::string path3, std::string path4, std::string path5);
static bool executeRawPath(const char *shellCmd);
static int termfix(uint32_t ttyId); static int termfix(uint32_t ttyId);
static int getVTid(); static int getVTid();