diff options
| author | Jan Parcel <Jan.Parcel@Sun.COM> | 2010-01-17 09:36:52 -0800 |
|---|---|---|
| committer | Jan Parcel <Jan.Parcel@Sun.COM> | 2010-01-17 09:36:52 -0800 |
| commit | 7e3e5701c73b753fb9dd17a0cbe0568b4cdda39e (patch) | |
| tree | ce7ea5da313d5bf779be070d1d789eb175f7abce /usr/src/lib/libdevinfo/devinfo_devperm.c | |
| parent | 9820c71034357bd7840b87218016a93aea266a6f (diff) | |
| download | illumos-joyent-7e3e5701c73b753fb9dd17a0cbe0568b4cdda39e.tar.gz | |
6868082 TX: devfsadm must rely on device_maps file with multiple hot-pluggable usb devices
6855420 TX: USB built-in floppy drive should automatically populate the Device Manager
Diffstat (limited to 'usr/src/lib/libdevinfo/devinfo_devperm.c')
| -rw-r--r-- | usr/src/lib/libdevinfo/devinfo_devperm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/lib/libdevinfo/devinfo_devperm.c b/usr/src/lib/libdevinfo/devinfo_devperm.c index e2716af8d3..d802783def 100644 --- a/usr/src/lib/libdevinfo/devinfo_devperm.c +++ b/usr/src/lib/libdevinfo/devinfo_devperm.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -269,8 +269,8 @@ logindevperm(const char *ttyn, uid_t uid, gid_t gid, void (*errmsg)(char *)) * devpath: Absolute path to /dev link * devfs_path: Returns malloced string: /devices path w/out "/devices" */ -static int -resolve_link(char *devpath, char **devfs_path) +int +devfs_resolve_link(char *devpath, char **devfs_path) { char contents[PATH_MAX + 1]; char stage_link[PATH_MAX + 1]; @@ -313,7 +313,7 @@ resolve_link(char *devpath, char **devfs_path) (void) strcat(stage_link, contents); } - return (resolve_link(stage_link, devfs_path)); + return (devfs_resolve_link(stage_link, devfs_path)); } if (devfs_path) { @@ -339,7 +339,7 @@ check_driver_match(char *path, char *line) char saveline[MAX_LINELEN]; char *p; - if (resolve_link(path, &devfs_path) == 0) { + if (devfs_resolve_link(path, &devfs_path) == 0) { char *p; char pwd_buf[PATH_MAX]; di_node_t node; |