3e4414508b
Hi Kay,
On 23:12 Sat 04 Sep , Kay Sievers wrote:
> Cool, a real bug :)
> Thanks, for the patch. I think it would be better to skip lenghth exceeding
> lines instead of cutting it and continue. While looking at it I restructured
> the buffer reading logic a bit and fixed another stupid bug.
Thanks for the cleanup.
You may have overlooked the fix for udev_config.c(parsing udev.conf) in
your patch. So, I've adapted the fixes you applied to namedev_parse.c
to this file also.
Also, while 'eating' the whitespace the 'count' doesn't get decremented.
This leads strncpy to copy the number of whitespace minus 1 characters
from the next line. Minus 1 because it copies '\n' from the current
line.
while (isspace(bufline[0])) {
bufline++;
+ count--;
}
.
.
.
strncpy(line, bufline, count);
Included patch(against udev-030) contains the above fixes as well as
your fixes.
Signed-off-by: Arun Bhanu <arun@codemovers.org>
93 lines
2.6 KiB
C
93 lines
2.6 KiB
C
/*
|
|
* udev.h
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef _UDEV_H_
|
|
#define _UDEV_H_
|
|
|
|
#include <sys/param.h>
|
|
#include "libsysfs/sysfs/libsysfs.h"
|
|
|
|
#define COMMENT_CHARACTER '#'
|
|
|
|
#define NAME_SIZE 256
|
|
#define OWNER_SIZE 30
|
|
#define GROUP_SIZE 30
|
|
#define MODE_SIZE 8
|
|
|
|
#define ACTION_SIZE 32
|
|
#define DEVPATH_SIZE 256
|
|
#define SUBSYSTEM_SIZE 32
|
|
#define SEQNUM_SIZE 32
|
|
|
|
#define LINE_SIZE 256
|
|
|
|
/* length of public data */
|
|
#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
|
|
|
|
struct udevice {
|
|
char name[NAME_SIZE];
|
|
char owner[OWNER_SIZE];
|
|
char group[GROUP_SIZE];
|
|
char type;
|
|
int major;
|
|
int minor;
|
|
unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */
|
|
char symlink[NAME_SIZE];
|
|
int partitions;
|
|
int config_line;
|
|
char config_file[NAME_SIZE];
|
|
long config_uptime;
|
|
|
|
/* private data that help us in building strings */
|
|
char bus_id[SYSFS_NAME_LEN];
|
|
char program_result[NAME_SIZE];
|
|
char kernel_number[NAME_SIZE];
|
|
char kernel_name[NAME_SIZE];
|
|
};
|
|
|
|
extern int udev_add_device(const char *path, const char *subsystem, int fake);
|
|
extern int udev_remove_device(const char *path, const char *subsystem);
|
|
extern void udev_init_config(void);
|
|
extern int udev_start(void);
|
|
extern int __udev_hotplug(char *action, const char *devpath,
|
|
const char *subsystem);
|
|
extern int parse_get_pair(char **orig_string, char **left, char **right);
|
|
extern void dev_d_send(struct udevice *dev, const char *subsystem,
|
|
const char *devpath);
|
|
|
|
extern char **main_argv;
|
|
extern char **main_envp;
|
|
extern char sysfs_path[SYSFS_PATH_MAX];
|
|
extern char udev_root[PATH_MAX];
|
|
extern char udev_db_filename[PATH_MAX+NAME_MAX];
|
|
extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
|
|
extern char udev_config_filename[PATH_MAX+NAME_MAX];
|
|
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
|
|
extern char default_mode_str[MODE_SIZE];
|
|
extern char default_owner_str[OWNER_SIZE];
|
|
extern char default_group_str[GROUP_SIZE];
|
|
extern int udev_log;
|
|
extern int udev_sleep;
|
|
extern int udev_dev_d;
|
|
|
|
#endif
|