webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 12:15:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Fix crash with small screen resolutions

Browse Source 
The installer is showing a help line at the bottom of the
screen which is in some languages rather long. If it is
longer than the width of the screen, the installer used to
crash which is now fixed in this patch.
This commit is contained in:
Michael Tremer
2015-01-02 14:41:33 +01:00
parent 214cc7b195
commit 7db3e17a4a
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/installer/main.c
View File

@@ -216,19 +216,31 @@ static char* get_system_release() {
}
static char* center_string(const char* str, int width) {
unsigned int str_len = strlen(str);
unsigned int indent_length = (width - str_len) / 2;
char indent[indent_length + 1];
for (unsigned int i = 0; i < indent_length; i++) {
indent[i] = ' ';
}
indent[indent_length] = '\0';
if (!str)
return NULL;
char* string = NULL;
if (asprintf(&string, "%s%s", indent, str) < 0)
return NULL;
unsigned int str_len = strlen(str);
if (str_len == width) {
string = strdup(str);
} else if (str_len > width) {
string = strdup(str);
string[width - 1] = '\0';
} else {
unsigned int indent_length = (width - str_len) / 2;
char indent[indent_length + 1];
for (unsigned int i = 0; i < indent_length; i++) {
indent[i] = ' ';
}
indent[indent_length] = '\0';
if (asprintf(&string, "%s%s", indent, str) < 0)
return NULL;
}
return string;
}
@@ -377,7 +389,8 @@ int main(int argc, char *argv[]) {
// Draw title
char* roottext = center_string(system_release, screen_cols);
newtDrawRootText(0, 0, roottext);
if (roottext)
newtDrawRootText(0, 0, roottext);
snprintf(title, sizeof(title), "%s - %s", NAME, SLOGAN);
@@ -423,7 +436,8 @@ int main(int argc, char *argv[]) {
else
helpline = center_string(_("<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"), screen_cols);
newtPushHelpLine(helpline);
if (helpline)
newtPushHelpLine(helpline);
if (!config.unattended) {
snprintf(message, sizeof(message),