examples/fileman.c: Reindent to project coding style

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2018-12-25 19:37:42 +01:00
parent 8e34e4e417
commit 8566eb8384

View File

@ -5,7 +5,7 @@
NOTE: this was taken from the GNU Readline documentation and ported
to libedit. A command to output the history list was added.
*/
*/
#include <stdio.h>
#include <sys/types.h>
@ -21,18 +21,18 @@
#include "editline.h"
void * xmalloc (size_t size);
void too_dangerous (char *caller);
void initialize_readline ();
int execute_line (char *line);
int valid_argument (char *caller, char *arg);
void *xmalloc(size_t size);
void too_dangerous(char *caller);
void initialize_readline();
int execute_line(char *line);
int valid_argument(char *caller, char *arg);
typedef int rl_icpfunc_t (char *);
typedef int rl_icpfunc_t(char *);
/* The names of functions that actually do the manipulation. */
int com_list (char *);
int com_view (char *);
int com_history (char *);
int com_list(char *);
int com_view(char *);
int com_history(char *);
int com_rename(char *);
int com_stat(char *);
int com_pwd(char *);
@ -45,30 +45,30 @@ int com_quit(char *);
can understand. */
typedef struct {
char *name; /* User printable name of the function. */
rl_icpfunc_t *func; /* Function to call to do the job. */
char *doc; /* Documentation for this function. */
char *name; /* User printable name of the function. */
rl_icpfunc_t *func; /* Function to call to do the job. */
char *doc; /* Documentation for this function. */
} COMMAND;
COMMAND commands[] = {
{ "cd", com_cd, "Change to directory DIR" },
{ "delete", com_delete, "Delete FILE" },
{ "help", com_help, "Display this text" },
{ "?", com_help, "Synonym for `help'" },
{ "list", com_list, "List files in DIR" },
{ "ls", com_list, "Synonym for `list'" },
{ "pwd", com_pwd, "Print the current working directory" },
{ "quit", com_quit, "Quit using Fileman" },
{ "rename", com_rename, "Rename FILE to NEWNAME" },
{ "stat", com_stat, "Print out statistics on FILE" },
{ "view", com_view, "View the contents of FILE" },
{ "history", com_history, "List editline history" },
{ (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
{"cd", com_cd, "Change to directory DIR"},
{"delete", com_delete, "Delete FILE"},
{"help", com_help, "Display this text"},
{"?", com_help, "Synonym for `help'"},
{"list", com_list, "List files in DIR"},
{"ls", com_list, "Synonym for `list'"},
{"pwd", com_pwd, "Print the current working directory"},
{"quit", com_quit, "Quit using Fileman"},
{"rename", com_rename, "Rename FILE to NEWNAME"},
{"stat", com_stat, "Print out statistics on FILE"},
{"view", com_view, "View the contents of FILE"},
{"history", com_history, "List editline history"},
{(char *)NULL, (rl_icpfunc_t *) NULL, (char *)NULL}
};
/* Forward declarations. */
char *stripwhite ();
COMMAND *find_command ();
char *stripwhite();
COMMAND *find_command();
/* The name of this program, as taken from argv[0]. */
char *progname;
@ -76,135 +76,127 @@ char *progname;
/* When non-zero, this means the user is done using this program. */
int done;
char *
dupstr (char* s)
char *dupstr(char *s)
{
char *r;
char *r;
r = xmalloc (strlen (s) + 1);
strcpy (r, s);
return (r);
r = xmalloc(strlen(s) + 1);
strcpy(r, s);
return (r);
}
int
main (int argc __attribute__((__unused__)), char **argv)
int main(int argc __attribute__ ((__unused__)), char **argv)
{
char *line, *s;
char *line, *s;
progname = argv[0];
progname = argv[0];
setlocale(LC_CTYPE, "");
setlocale(LC_CTYPE, "");
initialize_readline(); /* Bind our completer. */
initialize_readline(); /* Bind our completer. */
/* Loop reading and executing lines until the user quits. */
for ( ; done == 0; )
{
line = readline ("FileMan: ");
/* Loop reading and executing lines until the user quits. */
for (; done == 0;) {
line = readline("FileMan: ");
if (!line)
break;
if (!line)
break;
/* Remove leading and trailing whitespace from the line.
Then, if there is anything left, add it to the history list
and execute it. */
s = stripwhite(line);
/* Remove leading and trailing whitespace from the line.
Then, if there is anything left, add it to the history list
and execute it. */
s = stripwhite(line);
#if 0
if (*s) {
if (*s) {
char* expansion;
int result;
char *expansion;
int result;
result = history_expand(s, &expansion);
if (result < 0 || result == 2) {
fprintf(stderr, "%s\n", expansion);
} else {
add_history(expansion);
execute_line(expansion);
}
free(expansion);
}
result = history_expand(s, &expansion);
if (result < 0 || result == 2) {
fprintf(stderr, "%s\n", expansion);
} else {
add_history(expansion);
execute_line(expansion);
}
free(expansion);
}
#else
execute_line(s);
execute_line(s);
#endif
free(line);
}
exit (0);
free(line);
}
exit(0);
return 0;
return 0;
}
/* Execute a command line. */
int
execute_line (char *line)
int execute_line(char *line)
{
register int i;
COMMAND *command;
char *word;
register int i;
COMMAND *command;
char *word;
/* Isolate the command word. */
i = 0;
while (line[i] && isspace (line[i]))
i++;
word = line + i;
/* Isolate the command word. */
i = 0;
while (line[i] && isspace(line[i]))
i++;
word = line + i;
while (line[i] && !isspace (line[i]))
i++;
while (line[i] && !isspace(line[i]))
i++;
if (line[i])
line[i++] = '\0';
if (line[i])
line[i++] = '\0';
command = find_command (word);
command = find_command(word);
if (!command)
{
fprintf (stderr, "%s: No such command for FileMan.\n", word);
return (-1);
}
if (!command) {
fprintf(stderr, "%s: No such command for FileMan.\n", word);
return (-1);
}
/* Get argument to command, if any. */
while (isspace (line[i]))
i++;
/* Get argument to command, if any. */
while (isspace(line[i]))
i++;
word = line + i;
word = line + i;
/* Call the function. */
return ((*(command->func)) (word));
/* Call the function. */
return ((*(command->func)) (word));
}
/* Look up NAME as the name of a command, and return a pointer to that
command. Return a NULL pointer if NAME isn't a command name. */
COMMAND *
find_command (char *name)
COMMAND *find_command(char *name)
{
register int i;
register int i;
for (i = 0; commands[i].name; i++)
if (strcmp (name, commands[i].name) == 0)
return (&commands[i]);
for (i = 0; commands[i].name; i++)
if (strcmp(name, commands[i].name) == 0)
return (&commands[i]);
return ((COMMAND *)NULL);
return ((COMMAND *) NULL);
}
/* Strip whitespace from the start and end of STRING. Return a pointer
into STRING. */
char *
stripwhite (char *string)
char *stripwhite(char *string)
{
register char *s, *t;
register char *s, *t;
for (s = string; isspace (*s); s++)
;
for (s = string; isspace(*s); s++) ;
if (*s == 0)
return (s);
if (*s == 0)
return (s);
t = s + strlen (s) - 1;
while (t > s && isspace (*t))
t--;
*++t = '\0';
t = s + strlen(s) - 1;
while (t > s && isspace(*t))
t--;
*++t = '\0';
return s;
return s;
}
/* **************************************************************** */
@ -219,14 +211,13 @@ char **fileman_completion(const char *, int, int);
/* Tell the GNU Readline library how to complete. We want to try to
complete on command names if this is the first word in the line, or
on filenames if not. */
void
initialize_readline ()
void initialize_readline()
{
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "FileMan";
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "FileMan";
/* Tell the completer that we want a crack first. */
rl_attempted_completion_function = fileman_completion;
/* Tell the completer that we want a crack first. */
rl_attempted_completion_function = fileman_completion;
}
/* Attempt to complete on the contents of TEXT. START and END
@ -234,54 +225,51 @@ initialize_readline ()
complete. TEXT is the word to complete. We can use the entire
contents of rl_line_buffer in case we want to do some simple
parsing. Returnthe array of matches, or NULL if there aren't any. */
char **
fileman_completion (const char* text, int start, int end __attribute__((__unused__)))
char **fileman_completion(const char *text, int start, int end
__attribute__ ((__unused__)))
{
char **matches;
char **matches;
matches = (char **)NULL;
matches = (char **)NULL;
/* If this word is at the start of the line, then it is a command
to complete. Otherwise it is the name of a file in the current
directory. */
if (start == 0)
matches = rl_completion_matches (text, command_generator);
/* If this word is at the start of the line, then it is a command
to complete. Otherwise it is the name of a file in the current
directory. */
if (start == 0)
matches = rl_completion_matches(text, command_generator);
return (matches);
return (matches);
}
/* Generator function for command completion. STATE lets us
know whether to start from scratch; without any state
(i.e. STATE == 0), then we start at the top of the list. */
char *
command_generator (text, state)
const char *text;
int state;
char *command_generator(text, state)
const char *text;
int state;
{
static int list_index, len;
char *name;
static int list_index, len;
char *name;
/* If this is a new word to complete, initialize now. This
includes saving the length of TEXT for efficiency, and
initializing the index variable to 0. */
if (!state)
{
list_index = 0;
len = strlen (text);
}
/* If this is a new word to complete, initialize now. This
includes saving the length of TEXT for efficiency, and
initializing the index variable to 0. */
if (!state) {
list_index = 0;
len = strlen(text);
}
/* Return the next name which partially matches from the
command list. */
while ((name = commands[list_index].name))
{
list_index++;
/* Return the next name which partially matches from the
command list. */
while ((name = commands[list_index].name)) {
list_index++;
if (strncmp (name, text, len) == 0)
return (dupstr(name));
}
if (strncmp(name, text, len) == 0)
return (dupstr(name));
}
/* If no names matched, then return NULL. */
return ((char *)NULL);
/* If no names matched, then return NULL. */
return ((char *)NULL);
}
/* **************************************************************** */
@ -295,193 +283,173 @@ command_generator (text, state)
static char syscom[1024];
/* List the file(s) named in arg. */
int
com_list (char *arg)
int com_list(char *arg)
{
if (!arg)
arg = "";
if (!arg)
arg = "";
sprintf (syscom, "ls -FClg %s", arg);
return (system (syscom));
sprintf(syscom, "ls -FClg %s", arg);
return (system(syscom));
}
int
com_view (char *arg)
int com_view(char *arg)
{
if (!valid_argument ("view", arg))
return 1;
if (!valid_argument("view", arg))
return 1;
sprintf (syscom, "more %s", arg);
return (system (syscom));
sprintf(syscom, "more %s", arg);
return (system(syscom));
}
int
com_history(char* arg __attribute__((__unused__)))
int com_history(char *arg __attribute__ ((__unused__)))
{
const char *he;
const char *he;
/* rewind history */
while (el_prev_hist())
;
/* rewind history */
while (el_prev_hist()) ;
for (he = el_next_hist(); he != NULL; he = el_next_hist())
printf("%s\n", he);
for (he = el_next_hist(); he != NULL; he = el_next_hist())
printf("%s\n", he);
return 0;
return 0;
}
int
com_rename (char *arg __attribute__((__unused__)))
int com_rename(char *arg __attribute__ ((__unused__)))
{
too_dangerous ("rename");
return (1);
too_dangerous("rename");
return (1);
}
int
com_stat (char *arg)
int com_stat(char *arg)
{
struct stat finfo;
struct stat finfo;
if (!valid_argument ("stat", arg))
return (1);
if (!valid_argument("stat", arg))
return (1);
if (stat (arg, &finfo) == -1)
{
perror (arg);
return (1);
}
if (stat(arg, &finfo) == -1) {
perror(arg);
return (1);
}
printf ("Statistics for `%s':\n", arg);
printf("Statistics for `%s':\n", arg);
printf ("%s has %ld link%s, and is %lld byte%s in length.\n", arg,
(long) finfo.st_nlink,
(finfo.st_nlink == 1) ? "" : "s",
(long long) finfo.st_size,
(finfo.st_size == 1) ? "" : "s");
printf ("Inode Last Change at: %s", ctime (&finfo.st_ctime));
printf (" Last access at: %s", ctime (&finfo.st_atime));
printf (" Last modified at: %s", ctime (&finfo.st_mtime));
return (0);
printf("%s has %ld link%s, and is %lld byte%s in length.\n", arg,
(long)finfo.st_nlink,
(finfo.st_nlink == 1) ? "" : "s",
(long long)finfo.st_size, (finfo.st_size == 1) ? "" : "s");
printf("Inode Last Change at: %s", ctime(&finfo.st_ctime));
printf(" Last access at: %s", ctime(&finfo.st_atime));
printf(" Last modified at: %s", ctime(&finfo.st_mtime));
return (0);
}
int
com_delete (char *arg __attribute__((__unused__)))
int com_delete(char *arg __attribute__ ((__unused__)))
{
too_dangerous ("delete");
return (1);
too_dangerous("delete");
return (1);
}
/* Print out help for ARG, or for all of the commands if ARG is
not present. */
int
com_help (char *arg)
int com_help(char *arg)
{
register int i;
int printed = 0;
register int i;
int printed = 0;
for (i = 0; commands[i].name; i++)
{
if (!*arg || (strcmp (arg, commands[i].name) == 0))
{
printf ("%s\t\t%s.\n", commands[i].name, commands[i].doc);
printed++;
}
}
for (i = 0; commands[i].name; i++) {
if (!*arg || (strcmp(arg, commands[i].name) == 0)) {
printf("%s\t\t%s.\n", commands[i].name,
commands[i].doc);
printed++;
}
}
if (!printed)
{
printf ("No commands match `%s'. Possibilties are:\n", arg);
if (!printed) {
printf("No commands match `%s'. Possibilties are:\n", arg);
for (i = 0; commands[i].name; i++)
{
/* Print in six columns. */
if (printed == 6)
{
printed = 0;
printf ("\n");
}
for (i = 0; commands[i].name; i++) {
/* Print in six columns. */
if (printed == 6) {
printed = 0;
printf("\n");
}
printf ("%s\t", commands[i].name);
printed++;
}
printf("%s\t", commands[i].name);
printed++;
}
if (printed)
printf ("\n");
}
return (0);
if (printed)
printf("\n");
}
return (0);
}
/* Change to the directory ARG. */
int
com_cd (char *arg)
int com_cd(char *arg)
{
if (chdir (arg) == -1)
{
perror (arg);
return 1;
}
if (chdir(arg) == -1) {
perror(arg);
return 1;
}
com_pwd ("");
return (0);
com_pwd("");
return (0);
}
/* Print out the current working directory. */
int
com_pwd (char* ignore __attribute__((__unused__)))
int com_pwd(char *ignore __attribute__ ((__unused__)))
{
char dir[1024], *s;
char dir[1024], *s;
s = (char*)getcwd(dir, sizeof(dir) - 1);
if (s == 0)
{
printf ("Error getting pwd: %s\n", dir);
return 1;
}
s = (char *)getcwd(dir, sizeof(dir) - 1);
if (s == 0) {
printf("Error getting pwd: %s\n", dir);
return 1;
}
printf ("Current directory is %s\n", dir);
return 0;
printf("Current directory is %s\n", dir);
return 0;
}
/* The user wishes to quit using this program. Just set DONE
non-zero. */
int
com_quit (char *arg __attribute__((__unused__)))
int com_quit(char *arg __attribute__ ((__unused__)))
{
done = 1;
return (0);
done = 1;
return (0);
}
/* Function which tells you that you can't do this. */
void
too_dangerous (char *caller)
void too_dangerous(char *caller)
{
fprintf (stderr,
"%s: Too dangerous for me to distribute.\n",
caller);
fprintf (stderr, "Write it yourself.\n");
fprintf(stderr, "%s: Too dangerous for me to distribute.\n", caller);
fprintf(stderr, "Write it yourself.\n");
}
/* Return non-zero if ARG is a valid argument for CALLER,
else print an error message and return zero. */
int
valid_argument (char *caller, char *arg)
int valid_argument(char *caller, char *arg)
{
if (!arg || !*arg)
{
fprintf (stderr, "%s: Argument required.\n", caller);
return (0);
}
if (!arg || !*arg) {
fprintf(stderr, "%s: Argument required.\n", caller);
return (0);
}
return (1);
return (1);
}
void *
xmalloc (size_t size)
void *xmalloc(size_t size)
{
register void *value = (void*)malloc(size);
if (value == 0)
fprintf(stderr, "virtual memory exhausted");
return value;
register void *value = (void *)malloc(size);
if (value == 0)
fprintf(stderr, "virtual memory exhausted");
return value;
}
/**
* Local Variables:
* c-file-style: "k&r"
* c-basic-offset: 4
* End:
*/