PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow spaces in backup names

Browse Source
This commit is contained in:
Dees_Troy
2012-09-26 10:07:14 -04:00
parent 7c2dec8020
commit b9d1c6d461
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extra-functions.c
View File

@@ -23,7 +23,6 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <linux/input.h>
#include "bootloader.h"
@@ -93,11 +92,12 @@ int check_backup_name(int show_error) {
return 0; // A "0" (zero) means to use the current timestamp for the backup name
for (index=0; index<copy_size; index++) {
cur_char = (int)backup_name[index];
if ((cur_char >= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) {
if (cur_char == 32 || (cur_char >= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) {
// These are valid characters
// Numbers
// Upper case letters
// Lower case letters
// Space
// and -_.{}[]
} else {
if (show_error)

4
gui/devices/1024x600/res/ui.xml
View File

@@ -1859,7 +1859,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -2200,7 +2200,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/1024x768/res/ui.xml
View File

@@ -1859,7 +1859,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -2200,7 +2200,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/1280x800/res/ui.xml
View File

@@ -1859,7 +1859,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -2200,7 +2200,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/1920x1200/res/ui.xml
View File

@@ -1859,7 +1859,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -2200,7 +2200,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/320x480/res/ui.xml
View File

@@ -1438,7 +1438,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1777,7 +1777,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/480x800/res/ui.xml
View File

@@ -1437,7 +1437,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1776,7 +1776,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/480x854/res/ui.xml
View File

@@ -1436,7 +1436,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1775,7 +1775,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/540x960/res/ui.xml
View File

@@ -1437,7 +1437,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1776,7 +1776,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/720x1280/res/ui.xml
View File

@@ -1442,7 +1442,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1781,7 +1781,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/800x1280/res/ui.xml
View File

@@ -1438,7 +1438,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -1777,7 +1777,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>

4
gui/devices/800x480/res/ui.xml
View File

@@ -1859,7 +1859,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_name%</text>
<data name="tw_backup_name" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_filecheck=%tw_backups_folder%/%tw_backup_name%</action>
<action function="set">tw_existpage=backupname2</action>
@@ -2200,7 +2200,7 @@
<font resource="font" color="%text_color%" />
<text>%tw_backup_rename%</text>
<data name="tw_backup_rename" />
<restrict minlen="1" maxlen="64" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
<actions>
<action function="set">tw_back=restore</action>
<action function="set">tw_action=cmd</action>