Skip to content

Commit 67e0f34

Browse files
committed
use system() rather than popen() in FunKey menu
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
1 parent 9a9989d commit 67e0f34

1 file changed

Lines changed: 9 additions & 40 deletions

File tree

RetroFE/Source/Menu/MenuMode.cpp

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,6 @@ int MenuMode::launch( )
717717
int start_scroll=0;
718718
uint8_t screen_refresh = 1;
719719
char shell_cmd[100];
720-
FILE *fp;
721720
uint8_t menu_confirmation = 0;
722721
stop_menu_loop = 0;
723722
char fname[MAXPATHLEN];
@@ -845,12 +844,7 @@ int MenuMode::launch( )
845844

846845
/// ----- Shell cmd ----
847846
sprintf(shell_cmd, "%s %d", SHELL_CMD_VOLUME_SET, volume_percentage);
848-
fp = popen(shell_cmd, "r");
849-
if (fp == NULL) {
850-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
851-
} else {
852-
pclose(fp);
853-
}
847+
system(shell_cmd);
854848

855849
/// ------ Refresh screen ------
856850
screen_refresh = 1;
@@ -863,12 +857,8 @@ int MenuMode::launch( )
863857

864858
/// ----- Shell cmd ----
865859
sprintf(shell_cmd, "%s %d", SHELL_CMD_BRIGHTNESS_SET, brightness_percentage);
866-
fp = popen(shell_cmd, "r");
867-
if (fp == NULL) {
868-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
869-
} else {
870-
pclose(fp);
871-
}
860+
system(shell_cmd);
861+
872862
/// ------ Refresh screen ------
873863
screen_refresh = 1;
874864
}
@@ -910,12 +900,8 @@ int MenuMode::launch( )
910900

911901
/// ----- Shell cmd ----
912902
sprintf(shell_cmd, "%s %d", SHELL_CMD_VOLUME_SET, volume_percentage);
913-
fp = popen(shell_cmd, "r");
914-
if (fp == NULL) {
915-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
916-
} else {
917-
pclose(fp);
918-
}
903+
system(shell_cmd);
904+
919905
/// ------ Refresh screen ------
920906
screen_refresh = 1;
921907
}
@@ -927,12 +913,8 @@ int MenuMode::launch( )
927913

928914
/// ----- Shell cmd ----
929915
sprintf(shell_cmd, "%s %d", SHELL_CMD_BRIGHTNESS_SET, brightness_percentage);
930-
fp = popen(shell_cmd, "r");
931-
if (fp == NULL) {
932-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
933-
} else {
934-
pclose(fp);
935-
}
916+
system(shell_cmd);
917+
936918
/// ------ Refresh screen ------
937919
screen_refresh = 1;
938920
}
@@ -1005,14 +987,7 @@ int MenuMode::launch( )
1005987
menu_screen_refresh(menuItem, prevItem, scroll, menu_confirmation, 1);
1006988

1007989
/// ----- Shell cmd ----
1008-
/*fp = popen(usb_sharing?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT, "r");
1009-
if (fp == NULL) {
1010-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
1011-
}
1012-
else{
1013-
usb_sharing = !usb_sharing;
1014-
pclose(fp);
1015-
}*/
990+
/*system(usb_sharing?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT);*/
1016991

1017992
bool res = Utils::executeRawPath(usb_sharing?SHELL_CMD_USB_UNMOUNT:SHELL_CMD_USB_MOUNT);
1018993
if (!res) {
@@ -1099,13 +1074,7 @@ int MenuMode::launch( )
10991074

11001075
/// ----- Shell cmd ----
11011076
sprintf(shell_cmd, "%s", SHELL_CMD_POWERDOWN);
1102-
fp = popen(shell_cmd, "r");
1103-
if (fp == NULL) {
1104-
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
1105-
} else {
1106-
pclose(fp);
1107-
}
1108-
1077+
system(shell_cmd);
11091078
return MENU_RETURN_EXIT;
11101079
}
11111080
else{

0 commit comments

Comments
 (0)