old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

and then he found some minor bugs in file examination... and then they were 

fixed. :)


SVN revision: 4240
This commit is contained in:
Carsten Haitzler 2001-02-17 21:30:18 +00:00
parent 0aaea6c1c0
commit e486b98e93
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/file.c
View File

@ -14,9 +14,8 @@
#include "file.h"
static void __imlib_FileFieldWord(char *s, int num, char *wd);
static char *__imlib_FileRealFile(const char *file);
static char *
char *
__imlib_FileRealFile(const char *file)
{
char *colon;
@ -25,14 +24,14 @@ __imlib_FileRealFile(const char *file)
newfile = strdup(file);
if (!newfile) return NULL;
#ifndef __EMX__
colon = strrchr(file, ':');
colon = strrchr(newfile, ':');
if (!colon) return newfile;
*colon = 0;
return newfile;
#else
colon = strrchr(file, ':');
colon = strrchr(newfile, ':');
/* if colon is chars 0, 1, or 2 it might be a drive letter for os/2 */
if ((colon - file) < 3) return newfile;
if ((colon - newfile) < 3) return newfile;
if (!colon) return newfile;
*colon = 0;
return newfile;
@ -145,9 +144,19 @@ __imlib_FilePermissions(const char *s)
int
__imlib_FileCanRead(const char *s)
{
if (!(__imlib_FilePermissions(s) & (S_IRUSR | S_IRGRP | S_IROTH)))
return 0;
return (1 + access(s, R_OK));
char *fl;
int val;
fl = __imlib_FileRealFile(s);
if (!(__imlib_FilePermissions(fl) & (S_IRUSR | S_IRGRP | S_IROTH)))
{
free(fl);
return 0;
}
val = (1 + access(fl, R_OK));
free(fl);
return val;
}
char **

1
src/file.h
View File

@ -1,5 +1,6 @@
#ifndef __FILE
#define __FILE 1
char *__imlib_FileRealFile(const char *file);
char *__imlib_FileExtension(const char *file);
int __imlib_FileExists(const char *s);
int __imlib_FileIsFile(const char *s);