54988802b7
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
145 lines
3.2 KiB
C
145 lines
3.2 KiB
C
/*
|
|
* udev-remove.c
|
|
*
|
|
* Userspace devfs
|
|
*
|
|
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
|
|
#include "udev.h"
|
|
#include "udev_version.h"
|
|
#include "udev_dbus.h"
|
|
#include "logging.h"
|
|
#include "namedev.h"
|
|
#include "udevdb.h"
|
|
#include "libsysfs/libsysfs.h"
|
|
|
|
static int delete_path(char *path)
|
|
{
|
|
char *pos;
|
|
int retval;
|
|
|
|
pos = strrchr(path, '/');
|
|
while (1) {
|
|
*pos = '\0';
|
|
pos = strrchr(path, '/');
|
|
|
|
/* don't remove the last one */
|
|
if ((pos == path) || (pos == NULL))
|
|
break;
|
|
|
|
/* remove if empty */
|
|
retval = rmdir(path);
|
|
if (retval) {
|
|
if (errno == ENOTEMPTY)
|
|
return 0;
|
|
dbg("rmdir(%s) failed with error '%s'",
|
|
path, strerror(errno));
|
|
break;
|
|
}
|
|
dbg("removed '%s'", path);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int delete_node(struct udevice *dev)
|
|
{
|
|
char filename[255];
|
|
char *symlinks;
|
|
char *linkname;
|
|
int retval;
|
|
|
|
strncpy(filename, udev_root, sizeof(filename));
|
|
strncat(filename, dev->name, sizeof(filename));
|
|
|
|
info("removing device node '%s'", filename);
|
|
retval = unlink(filename);
|
|
if (retval) {
|
|
dbg("unlink(%s) failed with error '%s'",
|
|
filename, strerror(errno));
|
|
return retval;
|
|
}
|
|
|
|
/* remove subdirectories */
|
|
if (strchr(dev->name, '/'))
|
|
delete_path(filename);
|
|
|
|
if (*dev->symlink) {
|
|
symlinks = dev->symlink;
|
|
while (1) {
|
|
linkname = strsep(&symlinks, " ");
|
|
if (linkname == NULL)
|
|
break;
|
|
|
|
strncpy(filename, udev_root, sizeof(filename));
|
|
strncat(filename, linkname, sizeof(filename));
|
|
|
|
dbg("unlinking symlink '%s'", filename);
|
|
retval = unlink(filename);
|
|
if (retval) {
|
|
dbg("unlink(%s) failed with error '%s'",
|
|
filename, strerror(errno));
|
|
return retval;
|
|
}
|
|
if (strchr(dev->symlink, '/')) {
|
|
delete_path(filename);
|
|
}
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
/*
|
|
* Look up the sysfs path in the database to see if we have named this device
|
|
* something different from the kernel name. If we have, us it. If not, use
|
|
* the default kernel name for lack of anything else to know to do.
|
|
*/
|
|
int udev_remove_device(char *path, char *subsystem)
|
|
{
|
|
struct udevice dev;
|
|
char *temp;
|
|
int retval;
|
|
|
|
memset(&dev, 0, sizeof(dev));
|
|
|
|
retval = udevdb_get_dev(path, &dev);
|
|
if (retval) {
|
|
dbg("'%s' not found in database, falling back on default name", path);
|
|
temp = strrchr(path, '/');
|
|
if (temp == NULL)
|
|
return -ENODEV;
|
|
strncpy(dev.name, &temp[1], sizeof(dev.name));
|
|
}
|
|
|
|
dbg("name is '%s'", dev.name);
|
|
udevdb_delete_dev(path);
|
|
|
|
sysbus_send_remove(dev.name, path);
|
|
|
|
retval = delete_node(&dev);
|
|
return retval;
|
|
}
|