Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/eesh
Modified Files:
file.c main.c
Log Message:
Good bye __EMX__.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/eesh/file.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- file.c 13 Feb 2004 18:13:55 -0000 1.8
+++ file.c 18 Feb 2004 22:18:40 -0000 1.9
@@ -327,8 +327,6 @@
username(int uid)
{
char *s;
-
-#ifndef __EMX__
struct passwd *pwd;
EDBUG(9, "username");
@@ -339,10 +337,6 @@
/* Efree(pwd); */
EDBUG_RETURN(s);
}
-#else
- if ((s = getenv("USER")) != NULL)
- EDBUG_RETURN(duplicate(s));
-#endif
EDBUG_RETURN(duplicate("unknown"));
}
@@ -350,8 +344,6 @@
homedir(int uid)
{
char *s;
-
-#ifndef __EMX__
struct passwd *pwd;
EDBUG(9, "homedir");
@@ -362,19 +354,12 @@
/* Efree(pwd); */
EDBUG_RETURN(s);
}
-#else
- if ((s = getenv("HOME")) != NULL)
- EDBUG_RETURN(duplicate(s));
- if ((s = getenv("TMP")) != NULL)
- EDBUG_RETURN(duplicate(s));
-#endif
EDBUG_RETURN(duplicate("/tmp"));
}
char *
usershell(int uid)
{
-#ifndef __EMX__
char *s;
struct passwd *pwd;
@@ -387,9 +372,6 @@
EDBUG_RETURN(s);
}
EDBUG_RETURN(duplicate("/bin/sh"));
-#else
- EDBUG_RETURN(duplicate("sh.exe"));
-#endif
}
char *
@@ -584,11 +566,7 @@
int len, exelen;
EDBUG(9, "pathtoexec");
-#ifndef __EMX__
if (file[0] == '/')
-#else
- if (_fnisabs(file))
-#endif
{
if (canexec(file))
EDBUG_RETURN(duplicate(file));
@@ -600,11 +578,7 @@
EDBUG_RETURN(NULL);
cp = p;
exelen = strlen(file);
-#ifndef __EMX__
while ((ep = strchr(cp, ':')))
-#else
- while ((ep = strchr(cp, ';')))
-#endif
{
len = ep - cp;
s = Emalloc(len + 1);
@@ -613,10 +587,7 @@
strncpy(s, cp, len);
s[len] = 0;
s = Erealloc(s, len + 2 + exelen);
-#ifdef __EMX__
- if (s[len - 1] != '/')
-#endif
- strcat(s, "/");
+ strcat(s, "/");
strcat(s, file);
if (canexec(s))
EDBUG_RETURN(s);
@@ -631,10 +602,7 @@
strncpy(s, cp, len);
s[len] = 0;
s = Erealloc(s, len + 2 + exelen);
-#ifdef __EMX__
- if (s[len - 1] != '/')
-#endif
- strcat(s, "/");
+ strcat(s, "/");
strcat(s, file);
if (canexec(s))
EDBUG_RETURN(s);
@@ -651,11 +619,7 @@
int len, exelen;
EDBUG(9, "pathtofile");
-#ifndef __EMX__
if (file[0] == '/')
-#else
- if (_fnisabs(file))
-#endif
{
if (exists(file))
EDBUG_RETURN(duplicate(file));
@@ -667,11 +631,7 @@
EDBUG_RETURN(NULL);
cp = p;
exelen = strlen(file);
-#ifndef __EMX__
while ((ep = strchr(cp, ':')))
-#else
- while ((ep = strchr(cp, ';')))
-#endif
{
len = ep - cp;
s = Emalloc(len + 1);
@@ -680,10 +640,7 @@
strncpy(s, cp, len);
s[len] = 0;
s = Erealloc(s, len + 2 + exelen);
-#ifdef __EMX__
- if (s[len - 1] != '/')
-#endif
- strcat(s, "/");
+ strcat(s, "/");
strcat(s, file);
if (exists(s))
EDBUG_RETURN(s);
@@ -698,10 +655,7 @@
strncpy(s, cp, len);
s[len] = 0;
s = Erealloc(s, len + 2 + exelen);
-#ifdef __EMX__
- if (s[len - 1] != '/')
-#endif
- strcat(s, "/");
+ strcat(s, "/");
strcat(s, file);
if (exists(s))
EDBUG_RETURN(s);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/eesh/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- main.c 19 Jan 2004 22:30:26 -0000 1.14
+++ main.c 18 Feb 2004 22:18:40 -0000 1.15
@@ -23,9 +23,6 @@
#include "E.h"
#include <sys/time.h>
-#ifdef __EMX__
-#include <io.h> /* for select() in EMX */
-#endif
#include <sys/types.h>
#include <unistd.h>
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
