e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

a few more fixes. 

SVN revision: 2392
This commit is contained in:
Mandrake 2000-03-31 02:25:12 +00:00
parent 16491b4d25
commit b1228e176b
6 changed files with 93 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eesh/E.h
View File

@ -221,9 +221,15 @@ extern int debug_level;
void Alert(char *fmt, ...); void Alert(char *fmt, ...);
void InitStringList(void); void InitStringList(void);
void AssignIgnoreFunction(int (*FunctionToAssign) (void *), void *params); void AssignIgnoreFunction(int (*FunctionToAssign) (void *),
void AssignRestartFunction(int (*FunctionToAssign) (void *), void *params);
void AssignExitFunction(int (*FunctionToAssign) (void *), void *params); void *params);
void AssignRestartFunction(int (*FunctionToAssign) (void *),
void *params);
void AssignExitFunction(int (*FunctionToAssign) (void *),
void *params);
void AssignTitleText(char *text); void AssignTitleText(char *text);
void AssignIgnoreText(char *text); void AssignIgnoreText(char *text);
void AssignRestartText(char *text); void AssignRestartText(char *text);

1
eesh/alert.c
View File

@ -1,3 +1,4 @@
/* /*
Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors

8
eesh/comms.c
View File

@ -49,8 +49,8 @@ CommsFindCommsWindow()
if (a != None) if (a != None)
{ {
s = NULL; s = NULL;
XGetWindowProperty(disp, root.win, a, 0, 14, False, AnyPropertyType, &ar, XGetWindowProperty(disp, root.win, a, 0, 14, False, AnyPropertyType,
&format, &num, &after, &s); &ar, &format, &num, &after, &s);
if (s) if (s)
{ {
comms_win = 0; comms_win = 0;
@ -68,8 +68,8 @@ CommsFindCommsWindow()
if (comms_win) if (comms_win)
{ {
XGetWindowProperty(disp, comms_win, a, 0, 14, False, XGetWindowProperty(disp, comms_win, a, 0, 14, False,
AnyPropertyType, &ar, &format, &num, &after, AnyPropertyType, &ar, &format, &num,
&s); &after, &s);
if (s) if (s)
XFree(s); XFree(s);
else else

5
eesh/file.c
View File

@ -230,8 +230,7 @@ cp(char *s, char *ss)
EDBUG_RETURN_; EDBUG_RETURN_;
} }
time_t time_t moddate(char *s)
moddate(char *s)
{ {
struct stat st; struct stat st;
@ -327,6 +326,7 @@ char *
username(int uid) username(int uid)
{ {
char *s; char *s;
#ifndef __EMX__ #ifndef __EMX__
struct passwd *pwd; struct passwd *pwd;
@ -349,6 +349,7 @@ char *
homedir(int uid) homedir(int uid)
{ {
char *s; char *s;
#ifndef __EMX__ #ifndef __EMX__
struct passwd *pwd; struct passwd *pwd;

7
eesh/lists.c
View File

@ -1,3 +1,4 @@
/* /*
* Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors
* *
@ -52,7 +53,8 @@ FindItem(char *name, int id, int find_by, int type)
{ {
while (ptr) while (ptr)
{ {
if ((ptr->type == type) && (!strcmp(name, ptr->name)) && (ptr->id == id)) if ((ptr->type == type) && (!strcmp(name, ptr->name))
&& (ptr->id == id))
EDBUG_RETURN(ptr->item); EDBUG_RETURN(ptr->item);
ptr = ptr->next; ptr = ptr->next;
} }
@ -140,7 +142,8 @@ RemoveItem(char *name, int id, int find_by, int type)
{ {
while (ptr) while (ptr)
{ {
if ((ptr->type == type) && (!strcmp(name, ptr->name)) && (ptr->id == id)) if ((ptr->type == type) && (!strcmp(name, ptr->name))
&& (ptr->id == id))
{ {
if (pptr) if (pptr)
pptr->next = ptr->next; pptr->next = ptr->next;

7
eesh/main.c
View File

@ -33,7 +33,9 @@ extern char waitonly;
static int stdin_state; static int stdin_state;
void restore_stdin_state(void); void restore_stdin_state(void);
void restore_stdin_state(void) { void
restore_stdin_state(void)
{
fcntl(0, F_SETFL, stdin_state); fcntl(0, F_SETFL, stdin_state);
} }
@ -75,8 +77,7 @@ main(int argc, char **argv)
} }
else if ((!strcmp(argv[i], "-h")) || else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "--h")) || (!strcmp(argv[i], "--h")) ||
(!strcmp(argv[i], "-help")) || (!strcmp(argv[i], "-help")) || (!strcmp(argv[i], "--help")))
(!strcmp(argv[i], "--help")))
{ {
printf("%s [ -e \"Command to Send to Enlightenment then exit\"]\n" printf("%s [ -e \"Command to Send to Enlightenment then exit\"]\n"
" [ -ewait \"Command to Send to E then wait for a reply then exit\"]\n", " [ -ewait \"Command to Send to E then wait for a reply then exit\"]\n",