mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

src/filemanager/panelize.c: fix coding style.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-11-11 14:03:33 +03:00
parent 9c6a8e6c24
commit 177c64cd2f
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/filemanager/panelize.c
View File

@ -189,8 +189,6 @@ init_panelize (void)
INPUT_COMPLETE_SHELL_ESC); INPUT_COMPLETE_SHELL_ESC);
add_widget (panelize_dlg, pname); add_widget (panelize_dlg, pname);
add_widget (panelize_dlg, hline_new (y++, -1, -1)); add_widget (panelize_dlg, hline_new (y++, -1, -1));
x = (panelize_cols - blen) / 2; x = (panelize_cols - blen) / 2;
@ -222,11 +220,11 @@ panelize_done (void)
static void static void
add2panelize (char *label, char *command) add2panelize (char *label, char *command)
{ {
struct panelize *current, *old; struct panelize *current;
struct panelize *old = NULL;
old = NULL;
current = panelize; current = panelize;
while (current && strcmp (current->label, label) <= 0) while (current != NULL && strcmp (current->label, label) <= 0)
{ {
old = current; old = current;
current = current->next; current = current->next;
@ -242,6 +240,7 @@ add2panelize (char *label, char *command)
else else
{ {
struct panelize *new; struct panelize *new;
new = g_new (struct panelize, 1); new = g_new (struct panelize, 1);
new->label = label; new->label = label;
new->command = command; new->command = command;
@ -277,19 +276,17 @@ remove_from_panelize (struct panelize *entry)
if (strcmp (entry->label, _("Other command")) != 0) if (strcmp (entry->label, _("Other command")) != 0)
{ {
if (entry == panelize) if (entry == panelize)
{
panelize = panelize->next; panelize = panelize->next;
}
else else
{ {
struct panelize *current = panelize; struct panelize *current = panelize;
while (current && current->next != entry)
while (current != NULL && current->next != entry)
current = current->next; current = current->next;
if (current)
{ if (current != NULL)
current->next = entry->next; current->next = entry->next;
} }
}
g_free (entry->label); g_free (entry->label);
g_free (entry->command); g_free (entry->command);
@ -302,16 +299,12 @@ remove_from_panelize (struct panelize *entry)
static void static void
do_external_panelize (char *command) do_external_panelize (char *command)
{ {
int link_to_dir, stale_link;
struct stat st;
dir_list *list = &current_panel->dir; dir_list *list = &current_panel->dir;
char line[MC_MAXPATHLEN];
char *name;
FILE *external; FILE *external;
open_error_pipe (); open_error_pipe ();
external = popen (command, "r"); external = popen (command, "r");
if (!external) if (external == NULL)
{ {
close_error_pipe (D_ERROR, _("Cannot invoke command.")); close_error_pipe (D_ERROR, _("Cannot invoke command."));
return; return;
@ -325,22 +318,29 @@ do_external_panelize (char *command)
while (TRUE) while (TRUE)
{ {
char line[MC_MAXPATHLEN];
size_t len;
char *name;
int link_to_dir, stale_link;
struct stat st;
clearerr (external); clearerr (external);
if (fgets (line, sizeof (line), external) == NULL) if (fgets (line, sizeof (line), external) == NULL)
{ {
if (ferror (external) && errno == EINTR) if (ferror (external) != 0 && errno == EINTR)
continue; continue;
else
break; break;
} }
if (line[strlen (line) - 1] == '\n')
line[strlen (line) - 1] = 0; len = strlen (line);
if (strlen (line) < 1) if (line[len - 1] == '\n')
line[len - 1] = '\0';
if (line[0] == '\0')
continue; continue;
if (line[0] == '.' && IS_PATH_SEP (line[1]))
name = line + 2;
else
name = line; name = line;
if (line[0] == '.' && IS_PATH_SEP (line[1]))
name += 2;
if (!handle_path (name, &st, &link_to_dir, &stale_link)) if (!handle_path (name, &st, &link_to_dir, &stale_link))
continue; continue;
@ -635,15 +635,14 @@ load_panelize (void)
void void
save_panelize (void) save_panelize (void)
{ {
struct panelize *current = panelize; struct panelize *current;
mc_config_del_group (mc_global.main_config, panelize_section); mc_config_del_group (mc_global.main_config, panelize_section);
for (; current; current = current->next)
{ for (current = panelize; current != NULL; current = current->next)
if (strcmp (current->label, _("Other command"))) if (strcmp (current->label, _("Other command")) != 0)
mc_config_set_string (mc_global.main_config, mc_config_set_string (mc_global.main_config,
panelize_section, current->label, current->command); panelize_section, current->label, current->command);
}
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -651,10 +650,9 @@ save_panelize (void)
void void
done_panelize (void) done_panelize (void)
{ {
struct panelize *current = panelize; struct panelize *current, *next;
struct panelize *next;
for (; current; current = next) for (current = panelize; current != NULL; current = next)
{ {
next = current->next; next = current->next;
g_free (current->label); g_free (current->label);