From 004aa84e32fc3985aba5dfb86604e0748050fa86 Mon Sep 17 00:00:00 2001 From: "M. Liebmann" Date: Sat, 18 Jan 2014 17:11:12 +0100 Subject: [PATCH] SNeutrinoSettings: convert more char[...] configuration values to std::string --- src/driver/vfd.cpp | 4 ++-- src/gui/settings_manager.cpp | 11 ++++++----- src/gui/update.cpp | 4 ++-- src/gui/update_settings.cpp | 2 +- src/neutrino.cpp | 14 +++++++------- src/system/httptool.cpp | 19 ++++++++----------- src/system/settings.h | 14 +++++++------- 7 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index 6cfabe673..d6bb4d5b6 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -117,8 +117,8 @@ void CVFD::count_down() { void CVFD::wake_up() { if(!has_lcd) return; - if (atoi(g_settings.lcd_setting_dim_time) > 0) { - timeout_cnt = atoi(g_settings.lcd_setting_dim_time); + if (atoi(g_settings.lcd_setting_dim_time.c_str()) > 0) { + timeout_cnt = atoi(g_settings.lcd_setting_dim_time.c_str()); g_settings.lcd_setting_dim_brightness > -1 ? setBrightness(g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS]) : setPower(1); } diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 9bb0d2bf5..46ef84f34 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -87,12 +87,13 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) fileBrowser.Dir_Mode = true; if (fileBrowser.exec("/var/tuxbox") == true) { - char fname[256] = "neutrino.conf", sname[256]; - CStringInputSMS * sms = new CStringInputSMS(LOCALE_EXTRA_SAVECONFIG, fname, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789. "); + std::string fname = "neutrino.conf"; + CStringInputSMS * sms = new CStringInputSMS(LOCALE_EXTRA_SAVECONFIG, &fname, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789. "); sms->exec(NULL, ""); - sprintf(sname, "%s/%s", fileBrowser.getSelectedFile()->Name.c_str(), fname); - printf("[neutrino] save settings: %s\n", sname); - CNeutrinoApp::getInstance()->saveSetup(sname); + + std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname; + printf("[neutrino] save settings: %s\n", sname.c_str()); + CNeutrinoApp::getInstance()->saveSetup(sname.c_str()); delete sms; } return res; diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 48d65de19..d6f28f846 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -163,9 +163,9 @@ bool CFlashUpdate::selectHttpImage(void) SelectionWidget.addItem(new CMenuSeparator(CMenuSeparator::LINE)); SelectionWidget.addItem(new CMenuForwarder(current, false)); - std::ifstream urlFile(g_settings.softupdate_url_file); + std::ifstream urlFile(g_settings.softupdate_url_file.c_str()); #ifdef DEBUG - printf("[update] file %s\n", g_settings.softupdate_url_file); + printf("[update] file %s\n", g_settings.softupdate_url_file.c_str()); #endif unsigned int i = 0; diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index a261feac6..065f46b41 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -107,7 +107,7 @@ int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey) fileFilter.addFilter("urls"); fileBrowser.Filter = &fileFilter; if (fileBrowser.exec("/var/etc") == true) - strncpy(g_settings.softupdate_url_file, fileBrowser.getSelectedFile()->Name.c_str(), 30); + g_settings.softupdate_url_file = fileBrowser.getSelectedFile()->Name; return res; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index a180fa93a..ced01ca64 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -517,7 +517,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 ); //personalize - strcpy( g_settings.personalize_pincode, configfile.getString( "personalize_pincode", "0000" ).c_str() ); + g_settings.personalize_pincode = configfile.getString( "personalize_pincode", "0000" ); for (int i = 0; i < SNeutrinoSettings::P_SETTINGS_MAX; i++)//settings.h, settings.cpp g_settings.personalize[i] = configfile.getInt32( personalize_settings[i].personalize_settings_name, personalize_settings[i].personalize_default_val ); @@ -683,10 +683,10 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.flashupdate_createimage_add_spare = configfile.getInt32( "flashupdate_createimage_add_spare", 0); g_settings.flashupdate_createimage_add_kernel = configfile.getInt32( "flashupdate_createimage_add_kernel", 1); - strcpy(g_settings.softupdate_url_file, configfile.getString("softupdate_url_file", "/var/etc/update.urls").c_str()); - strcpy(g_settings.softupdate_proxyserver, configfile.getString("softupdate_proxyserver", "" ).c_str()); - strcpy(g_settings.softupdate_proxyusername, configfile.getString("softupdate_proxyusername", "" ).c_str()); - strcpy(g_settings.softupdate_proxypassword, configfile.getString("softupdate_proxypassword", "" ).c_str()); + g_settings.softupdate_url_file = configfile.getString("softupdate_url_file", "/var/etc/update.urls"); + g_settings.softupdate_proxyserver = configfile.getString("softupdate_proxyserver", "" ); + g_settings.softupdate_proxyusername = configfile.getString("softupdate_proxyusername", "" ); + g_settings.softupdate_proxypassword = configfile.getString("softupdate_proxypassword", "" ); // g_settings.font_file = configfile.getString("font_file", FONTDIR"/neutrino.ttf"); g_settings.ttx_font_file = configfile.getString( "ttx_font_file", FONTDIR"/DejaVuLGCSansMono-Bold.ttf"); @@ -702,14 +702,14 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.parentallock_lockage = 18; } g_settings.parentallock_defaultlocked = configfile.getInt32("parentallock_defaultlocked", 0); - strcpy( g_settings.parentallock_pincode, configfile.getString( "parentallock_pincode", "0000" ).c_str() ); + g_settings.parentallock_pincode = configfile.getString( "parentallock_pincode", "0000" ); for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) g_settings.timing[i] = configfile.getInt32(locale_real_names[timing_setting[i].name], timing_setting[i].default_timing); for (int i = 0; i < SNeutrinoSettings::LCD_SETTING_COUNT; i++) g_settings.lcd_setting[i] = configfile.getInt32(lcd_setting[i].name, lcd_setting[i].default_value); - strcpy(g_settings.lcd_setting_dim_time, configfile.getString("lcd_dim_time","0").c_str()); + g_settings.lcd_setting_dim_time = configfile.getString("lcd_dim_time","0"); g_settings.lcd_setting_dim_brightness = configfile.getInt32("lcd_dim_brightness", 0); g_settings.lcd_info_line = configfile.getInt32("lcd_info_line", 0);//channel name or clock diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp index 20bd5fba7..ab93c954c 100644 --- a/src/system/httptool.cpp +++ b/src/system/httptool.cpp @@ -96,21 +96,18 @@ printf("url is %s\n", URL.c_str()); curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); #endif - if(strcmp(g_settings.softupdate_proxyserver, "")!=0) - {//use proxyserver + if (!g_settings.softupdate_proxyserver.empty()) {//use proxyserver #ifdef DEBUG -printf("use proxyserver : %s\n", g_settings.softupdate_proxyserver); +printf("use proxyserver : %s\n", g_settings.softupdate_proxyserver.c_str()); #endif - curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver); + curl_easy_setopt(curl, CURLOPT_PROXY, g_settings.softupdate_proxyserver.c_str()); - if(strcmp(g_settings.softupdate_proxyusername,"")!=0) - {//use auth + if (!g_settings.softupdate_proxyusername.empty()) {//use auth //printf("use proxyauth\n"); - char tmp[200]; - strcpy(tmp, g_settings.softupdate_proxyusername); - strcat(tmp, ":"); - strcat(tmp, g_settings.softupdate_proxypassword); - curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp); + std::string tmp = g_settings.softupdate_proxyusername; + tmp += ":"; + tmp += g_settings.softupdate_proxypassword; + curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, tmp.c_str()); } } #ifdef DEBUG diff --git a/src/system/settings.h b/src/system/settings.h index 61b9998cb..ff069d879 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -238,7 +238,7 @@ struct SNeutrinoSettings }; int personalize[P_SETTINGS_MAX]; - char personalize_pincode[5]; + std::string personalize_pincode; //timing enum TIMING_SETTINGS @@ -492,10 +492,10 @@ struct SNeutrinoSettings //Software-update int softupdate_mode; - char softupdate_url_file[31]; - char softupdate_proxyserver[31]; - char softupdate_proxyusername[31]; - char softupdate_proxypassword[31]; + std::string softupdate_url_file; + std::string softupdate_proxyserver; + std::string softupdate_proxyusername; + std::string softupdate_proxypassword; int softupdate_name_mode_apply; int softupdate_name_mode_backup; int apply_settings; @@ -514,7 +514,7 @@ struct SNeutrinoSettings int parentallock_prompt; int parentallock_lockage; int parentallock_defaultlocked; - char parentallock_pincode[5]; + std::string parentallock_pincode; // Font sizes @@ -568,7 +568,7 @@ struct SNeutrinoSettings }; int lcd_setting[LCD_SETTING_COUNT]; int lcd_info_line; - char lcd_setting_dim_time[4]; + std::string lcd_setting_dim_time; int lcd_setting_dim_brightness; int led_tv_mode; int led_standby_mode;