ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

eject: simplify find_device 

Signed-off-by: Michal Luscon <mluscon@redhat.com>
This commit is contained in:
Michal Luscon 2012-02-08 16:27:08 +01:00 committed by Karel Zak
parent 035ed966a4
commit d36e80a759
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
misc-utils/eject
View File

Binary file not shown.

45
misc-utils/eject.c
View File

@ -292,13 +292,6 @@ static int FileExists(const char *name)
*
* foo (if foo starts with '.' or '/')
* /dev/foo
* /media/foo
* /mnt/foo
* /dev/cdroms/foo
* /dev/cdroms/foo0
* /dev/dsk/foo
* /dev/rdsk/foo
* ./foo
*
* If found, return the full path. If not found, return 0.
* Returns pointer to dynamically allocated string.
@ -320,44 +313,6 @@ static char *find_device(const char *name)
if (FileExists(buf))
return buf;
strcpy(buf, "/media/");
strcat(buf, name);
if (FileExists(buf))
return buf;
strcpy(buf, "/mnt/");
strcat(buf, name);
if (FileExists(buf))
return buf;
/* for devfs under Linux */
strcpy(buf, "/dev/cdroms/");
strcat(buf, name);
if (FileExists(buf))
return buf;
strcpy(buf, "/dev/cdroms/");
strcat(buf, name);
strcat(buf, "0");
if (FileExists(buf))
return buf;
/* for devfs under Solaris */
strcpy(buf, "/dev/rdsk/");
strcat(buf, name);
if (FileExists(buf))
return buf;
strcpy(buf, "/dev/dsk/");
strcat(buf, name);
if (FileExists(buf))
return buf;
strcpy(buf, "./");
strcat(buf, name);
if (FileExists(buf))
return buf;
free(buf);
buf = 0;
return 0;