2003-07-19 07:08:00 +04:00
/*
2003-12-20 05:29:10 +03:00
* sysfs_utils . c
2003-07-19 07:08:00 +04:00
*
* System utility functions for libsysfs
*
2003-10-21 12:19:14 +04:00
* Copyright ( C ) IBM Corp . 2003
2003-07-19 07:08:00 +04:00
*
* This library is free software ; you can redistribute it and / or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation ; either
* version 2.1 of the License , or ( at your option ) any later version .
*
* This library 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
* Lesser General Public License for more details .
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library ; if not , write to the Free Software
* Foundation , Inc . , 59 Temple Place , Suite 330 , Boston , MA 02111 - 1307 USA
*
*/
2004-02-18 10:59:06 +03:00
# include "sysfs/libsysfs.h"
2003-07-19 07:08:00 +04:00
# include "sysfs.h"
2003-10-23 10:48:55 +04:00
# ifndef __KLIBC__
# include <mntent.h>
# endif
2003-07-19 07:08:00 +04:00
2004-03-12 11:57:30 +03:00
static int sort_char ( void * new_elem , void * old_elem )
{
return ( ( strncmp ( ( char * ) new_elem , ( char * ) old_elem ,
strlen ( ( char * ) new_elem ) ) ) < 0 ? 1 : 0 ) ;
}
2004-01-15 09:21:38 +03:00
/**
* sysfs_remove_trailing_slash : Removes any trailing ' / ' in the given path
* @ path : Path to look for the trailing ' / '
* Returns 0 on success 1 on error
*/
2004-03-12 11:57:30 +03:00
int sysfs_remove_trailing_slash ( char * path )
2004-01-15 09:21:38 +03:00
{
2004-03-12 11:57:30 +03:00
char * c = NULL ;
2004-01-15 09:21:38 +03:00
if ( path = = NULL ) {
errno = EINVAL ;
return 1 ;
}
c = strrchr ( path , ' / ' ) ;
if ( c = = NULL ) {
dprintf ( " Invalid path %s \n " , path ) ;
errno = EINVAL ;
return 1 ;
}
if ( * ( c + 1 ) = = ' \0 ' )
* c = ' \0 ' ;
return 0 ;
}
2003-07-19 07:08:00 +04:00
/**
2004-03-12 11:57:30 +03:00
* sysfs_get_fs_mnt_path : Gets the mount point for specified filesystem .
2003-07-19 07:08:00 +04:00
* @ fs_type : filesystem type to retrieve mount point
* @ mnt_path : place to put the retrieved mount path
* @ len : size of mnt_path
* returns 0 with success and - 1 with error .
*/
2004-03-12 11:57:30 +03:00
static int sysfs_get_fs_mnt_path ( const char * fs_type ,
char * mnt_path , size_t len )
2003-07-19 07:08:00 +04:00
{
2003-10-23 10:48:55 +04:00
# ifdef __KLIBC__
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( mnt_path , " /sys " , len ) ;
2003-10-23 10:48:55 +04:00
return 0 ;
# else
2003-07-19 07:08:00 +04:00
FILE * mnt ;
struct mntent * mntent ;
int ret = 0 ;
size_t dirlen = 0 ;
/* check arg */
2004-03-12 11:57:30 +03:00
if ( fs_type = = NULL | | mnt_path = = NULL | | len = = 0 ) {
2003-07-19 07:08:00 +04:00
errno = EINVAL ;
return - 1 ;
}
if ( ( mnt = setmntent ( SYSFS_PROC_MNTS , " r " ) ) = = NULL ) {
2003-10-21 12:19:14 +04:00
dprintf ( " Error getting mount information \n " ) ;
2003-07-19 07:08:00 +04:00
return - 1 ;
}
while ( ret = = 0 & & dirlen = = 0 & & ( mntent = getmntent ( mnt ) ) ! = NULL ) {
if ( strcmp ( mntent - > mnt_type , fs_type ) = = 0 ) {
dirlen = strlen ( mntent - > mnt_dir ) ;
if ( dirlen < = ( len - 1 ) ) {
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( mnt_path , mntent - > mnt_dir , len ) ;
2003-07-19 07:08:00 +04:00
} else {
2003-10-21 12:19:14 +04:00
dprintf ( " Error - mount path too long \n " ) ;
2003-07-19 07:08:00 +04:00
ret = - 1 ;
}
}
}
endmntent ( mnt ) ;
if ( dirlen = = 0 & & ret = = 0 ) {
2003-10-21 12:19:14 +04:00
dprintf ( " Filesystem %s not found! \n " , fs_type ) ;
2003-07-19 07:08:00 +04:00
errno = EINVAL ;
ret = - 1 ;
}
2004-01-15 09:21:38 +03:00
if ( ( sysfs_remove_trailing_slash ( mnt_path ) ) ! = 0 )
ret = - 1 ;
2003-07-19 07:08:00 +04:00
return ret ;
2003-10-23 10:48:55 +04:00
# endif
2003-07-19 07:08:00 +04:00
}
/*
* sysfs_get_mnt_path : Gets the sysfs mount point .
* @ mnt_path : place to put " sysfs " mount point
* @ len : size of mnt_path
* returns 0 with success and - 1 with error .
*/
2004-03-12 11:57:30 +03:00
int sysfs_get_mnt_path ( char * mnt_path , size_t len )
2003-07-19 07:08:00 +04:00
{
2003-11-12 16:37:24 +03:00
char * sysfs_path = NULL ;
int ret = 0 ;
2003-07-19 07:08:00 +04:00
2004-03-12 11:57:30 +03:00
if ( mnt_path = = NULL | | len = = 0 ) {
2003-07-19 07:08:00 +04:00
errno = EINVAL ;
2003-11-12 16:37:24 +03:00
return - 1 ;
}
sysfs_path = getenv ( SYSFS_PATH_ENV ) ;
2004-01-15 09:21:38 +03:00
if ( sysfs_path ! = NULL ) {
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( mnt_path , sysfs_path , len ) ;
2004-01-15 09:21:38 +03:00
if ( ( sysfs_remove_trailing_slash ( mnt_path ) ) ! = 0 )
return 1 ;
} else
2003-11-12 16:37:24 +03:00
ret = sysfs_get_fs_mnt_path ( SYSFS_FSTYPE_NAME , mnt_path , len ) ;
2003-07-19 07:08:00 +04:00
return ret ;
}
/**
* sysfs_get_name_from_path : returns last name from a " / " delimited path
* @ path : path to get name from
* @ name : where to put name
* @ len : size of name
*/
2004-03-12 11:57:30 +03:00
int sysfs_get_name_from_path ( const char * path , char * name , size_t len )
2003-07-19 07:08:00 +04:00
{
2004-03-12 11:57:30 +03:00
char tmp [ SYSFS_PATH_MAX ] ;
char * n = NULL ;
2003-07-19 07:08:00 +04:00
2004-03-12 11:57:30 +03:00
if ( path = = NULL | | name = = NULL | | len = = 0 ) {
2003-07-19 07:08:00 +04:00
errno = EINVAL ;
return - 1 ;
}
2003-11-25 10:47:43 +03:00
memset ( tmp , 0 , SYSFS_PATH_MAX ) ;
2004-03-12 11:57:30 +03:00
safestrcpy ( tmp , path ) ;
2003-11-25 10:47:43 +03:00
n = strrchr ( tmp , ' / ' ) ;
2003-07-19 07:08:00 +04:00
if ( n = = NULL ) {
errno = EINVAL ;
return - 1 ;
}
2003-12-20 05:29:10 +03:00
if ( * ( n + 1 ) = = ' \0 ' ) {
* n = ' \0 ' ;
n = strrchr ( tmp , ' / ' ) ;
if ( n = = NULL ) {
errno = EINVAL ;
return - 1 ;
}
}
2003-07-19 07:08:00 +04:00
n + + ;
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( name , n , len ) ;
2003-07-19 07:08:00 +04:00
return 0 ;
}
2004-01-15 09:21:38 +03:00
2003-07-19 07:08:00 +04:00
/**
* sysfs_get_link : returns link source
* @ path : symbolic link ' s path
* @ target : where to put name
* @ len : size of name
*/
2004-03-12 11:57:30 +03:00
int sysfs_get_link ( const char * path , char * target , size_t len )
2003-07-19 07:08:00 +04:00
{
2004-03-12 11:57:30 +03:00
char devdir [ SYSFS_PATH_MAX ] ;
char linkpath [ SYSFS_PATH_MAX ] ;
char temp_path [ SYSFS_PATH_MAX ] ;
char * d = NULL , * s = NULL ;
2003-11-12 16:37:24 +03:00
int slashes = 0 , count = 0 ;
2003-07-19 07:08:00 +04:00
2004-03-12 11:57:30 +03:00
if ( path = = NULL | | target = = NULL | | len = = 0 ) {
2003-07-19 07:08:00 +04:00
errno = EINVAL ;
return - 1 ;
}
memset ( devdir , 0 , SYSFS_PATH_MAX ) ;
memset ( linkpath , 0 , SYSFS_PATH_MAX ) ;
2004-03-12 11:57:30 +03:00
memset ( temp_path , 0 , SYSFS_PATH_MAX ) ;
safestrcpy ( devdir , path ) ;
2003-07-19 07:08:00 +04:00
if ( ( readlink ( path , linkpath , SYSFS_PATH_MAX ) ) < 0 ) {
return - 1 ;
}
d = linkpath ;
2004-01-15 09:21:38 +03:00
/*
* Three cases here :
* 1. relative path = > format . . / . .
* 2. absolute path = > format / abcd / efgh
* 3. relative path _from_ this dir = > format abcd / efgh
*/
switch ( * d ) {
case ' . ' :
/*
* handle the case where link is of type . / abcd / xxx
*/
2004-03-12 11:57:30 +03:00
safestrcpy ( temp_path , devdir ) ;
2004-01-15 09:21:38 +03:00
if ( * ( d + 1 ) = = ' / ' )
d + = 2 ;
else if ( * ( d + 1 ) = = ' . ' )
goto parse_path ;
2004-03-12 11:57:30 +03:00
s = strrchr ( temp_path , ' / ' ) ;
2004-01-15 09:21:38 +03:00
if ( s ! = NULL ) {
* ( s + 1 ) = ' \0 ' ;
2004-03-12 11:57:30 +03:00
safestrcat ( temp_path , d ) ;
2004-01-15 09:21:38 +03:00
} else {
2004-03-12 11:57:30 +03:00
safestrcpy ( temp_path , d ) ;
2004-01-15 09:21:38 +03:00
}
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( target , temp_path , len ) ;
2004-01-15 09:21:38 +03:00
break ;
/*
* relative path
* getting rid of leading " ../.. "
*/
parse_path :
while ( * d = = ' / ' | | * d = = ' . ' ) {
if ( * d = = ' / ' )
slashes + + ;
d + + ;
}
d - - ;
s = & devdir [ strlen ( devdir ) - 1 ] ;
while ( s ! = NULL & & count ! = ( slashes + 1 ) ) {
s - - ;
if ( * s = = ' / ' )
count + + ;
}
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( s , d , ( SYSFS_PATH_MAX - strlen ( devdir ) ) ) ;
safestrcpymax ( target , devdir , len ) ;
2004-01-15 09:21:38 +03:00
break ;
case ' / ' :
/* absolute path - copy as is */
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( target , linkpath , len ) ;
2004-01-15 09:21:38 +03:00
break ;
default :
/* relative path from this directory */
2004-03-12 11:57:30 +03:00
safestrcpy ( temp_path , devdir ) ;
s = strrchr ( temp_path , ' / ' ) ;
2004-01-15 09:21:38 +03:00
if ( s ! = NULL ) {
* ( s + 1 ) = ' \0 ' ;
2004-03-12 11:57:30 +03:00
safestrcat ( temp_path , linkpath ) ;
2004-01-15 09:21:38 +03:00
} else {
2004-03-12 11:57:30 +03:00
safestrcpy ( temp_path , linkpath ) ;
}
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( target , temp_path , len ) ;
2003-11-12 16:37:24 +03:00
}
2003-07-19 07:08:00 +04:00
return 0 ;
}
2003-10-21 12:19:14 +04:00
/**
* sysfs_del_name : free function for sysfs_open_subsystem_list
* @ name : memory area to be freed
*/
2003-11-25 10:47:43 +03:00
static void sysfs_del_name ( void * name )
2003-10-21 12:19:14 +04:00
{
free ( name ) ;
}
/**
* sysfs_close_list : generic list free routine
* @ list : dlist to free
* Returns nothing
*/
void sysfs_close_list ( struct dlist * list )
{
if ( list ! = NULL )
dlist_destroy ( list ) ;
}
/**
* sysfs_open_subsystem_list : gets a list of all supported " name " subsystem
* details from the system
* @ name : name of the subsystem , eg . , " bus " , " class " , " devices "
* Returns a dlist of supported names or NULL if subsystem not supported
*/
2004-03-12 11:57:30 +03:00
struct dlist * sysfs_open_subsystem_list ( char * name )
2003-10-21 12:19:14 +04:00
{
2004-03-12 11:57:30 +03:00
char sysfs_path [ SYSFS_PATH_MAX ] , * subsys_name = NULL ;
char * c = NULL ;
2003-10-21 12:19:14 +04:00
struct sysfs_directory * dir = NULL , * cur = NULL ;
struct dlist * list = NULL ;
if ( name = = NULL )
return NULL ;
if ( sysfs_get_mnt_path ( sysfs_path , SYSFS_PATH_MAX ) ! = 0 ) {
dprintf ( " Error getting sysfs mount point \n " ) ;
return NULL ;
}
2004-01-15 09:21:38 +03:00
2004-03-12 11:57:30 +03:00
safestrcat ( sysfs_path , " / " ) ;
safestrcat ( sysfs_path , name ) ;
2003-10-21 12:19:14 +04:00
dir = sysfs_open_directory ( sysfs_path ) ;
if ( dir = = NULL ) {
dprintf ( " Error opening sysfs_directory at %s \n " , sysfs_path ) ;
return NULL ;
}
2003-12-20 05:29:10 +03:00
if ( ( sysfs_read_dir_subdirs ( dir ) ) ! = 0 ) {
2003-10-21 12:19:14 +04:00
dprintf ( " Error reading sysfs_directory at %s \n " , sysfs_path ) ;
sysfs_close_directory ( dir ) ;
return NULL ;
}
if ( dir - > subdirs ! = NULL ) {
list = dlist_new_with_delete ( SYSFS_NAME_LEN ,
sysfs_del_name ) ;
if ( list = = NULL ) {
dprintf ( " Error creating list \n " ) ;
sysfs_close_directory ( dir ) ;
return NULL ;
}
dlist_for_each_data ( dir - > subdirs , cur ,
struct sysfs_directory ) {
subsys_name = ( char * ) calloc ( 1 , SYSFS_NAME_LEN ) ;
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( subsys_name , cur - > name , SYSFS_NAME_LEN ) ;
2004-03-12 11:57:30 +03:00
dlist_unshift_sorted ( list , subsys_name , sort_char ) ;
2003-10-21 12:19:14 +04:00
}
}
sysfs_close_directory ( dir ) ;
2003-11-25 10:47:43 +03:00
/*
* We are now considering " block " as a " class " . Hence , if the subsys
* name requested here is " class " , verify if " block " is supported on
* this system and return the same .
*/
2003-12-16 08:53:28 +03:00
if ( strcmp ( name , SYSFS_CLASS_NAME ) = = 0 ) {
2003-11-25 10:47:43 +03:00
c = strstr ( sysfs_path , SYSFS_CLASS_NAME ) ;
if ( c = = NULL )
goto out ;
2004-03-12 11:57:30 +03:00
* c = ' \0 ' ;
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( c , SYSFS_BLOCK_NAME ,
2004-03-12 11:57:30 +03:00
sizeof ( sysfs_path ) - strlen ( sysfs_path ) ) ;
2003-12-20 05:29:10 +03:00
if ( ( sysfs_path_is_dir ( sysfs_path ) ) = = 0 ) {
2003-11-25 10:47:43 +03:00
subsys_name = ( char * ) calloc ( 1 , SYSFS_NAME_LEN ) ;
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( subsys_name , SYSFS_BLOCK_NAME ,
2004-03-12 11:57:30 +03:00
SYSFS_NAME_LEN ) ;
dlist_unshift_sorted ( list , subsys_name , sort_char ) ;
2003-11-25 10:47:43 +03:00
}
}
out :
2003-10-21 12:19:14 +04:00
return list ;
}
/**
* sysfs_open_bus_devices_list : gets a list of all devices on " name " bus
* @ name : name of the subsystem , eg . , " pci " , " scsi " , " usb "
* Returns a dlist of supported names or NULL if subsystem not supported
*/
2004-03-12 11:57:30 +03:00
struct dlist * sysfs_open_bus_devices_list ( char * name )
2003-10-21 12:19:14 +04:00
{
2004-03-12 11:57:30 +03:00
char sysfs_path [ SYSFS_PATH_MAX ] , * device_name = NULL ;
2003-10-21 12:19:14 +04:00
struct sysfs_directory * dir = NULL ;
struct sysfs_link * cur = NULL ;
struct dlist * list = NULL ;
if ( name = = NULL )
return NULL ;
if ( sysfs_get_mnt_path ( sysfs_path , SYSFS_PATH_MAX ) ! = 0 ) {
dprintf ( " Error getting sysfs mount point \n " ) ;
return NULL ;
}
2004-03-12 11:57:30 +03:00
safestrcat ( sysfs_path , " / " ) ;
safestrcat ( sysfs_path , SYSFS_BUS_NAME ) ;
safestrcat ( sysfs_path , " / " ) ;
safestrcat ( sysfs_path , name ) ;
safestrcat ( sysfs_path , " / " ) ;
safestrcat ( sysfs_path , SYSFS_DEVICES_NAME ) ;
2003-10-21 12:19:14 +04:00
dir = sysfs_open_directory ( sysfs_path ) ;
if ( dir = = NULL ) {
dprintf ( " Error opening sysfs_directory at %s \n " , sysfs_path ) ;
return NULL ;
}
2003-12-20 05:29:10 +03:00
if ( ( sysfs_read_dir_links ( dir ) ) ! = 0 ) {
2003-10-21 12:19:14 +04:00
dprintf ( " Error reading sysfs_directory at %s \n " , sysfs_path ) ;
sysfs_close_directory ( dir ) ;
return NULL ;
}
if ( dir - > links ! = NULL ) {
list = dlist_new_with_delete ( SYSFS_NAME_LEN ,
sysfs_del_name ) ;
if ( list = = NULL ) {
dprintf ( " Error creating list \n " ) ;
sysfs_close_directory ( dir ) ;
return NULL ;
}
dlist_for_each_data ( dir - > links , cur ,
struct sysfs_link ) {
device_name = ( char * ) calloc ( 1 , SYSFS_NAME_LEN ) ;
[PATCH] more Libsysfs updates
On Thu, Mar 11, 2004 at 02:36:23PM +0100, Kay Sievers wrote:
> On Thu, 2004-03-11 at 15:02, Ananth N Mavinakayanahalli wrote:
> > On Thu, Mar 11, 2004 at 02:04:36PM +0100, Kay Sievers wrote:
> > > On Thu, Mar 11, 2004 at 11:53:50AM +0500, Ananth N Mavinakayanahalli wrote:
> > >
> > > > +#define safestrcpy(to, from) strncpy(to, from, sizeof(to)-1)
> > > > +#define safestrcat(to, from) strncat(to, from, sizeof(to) - strlen(to)-1)
> > >
> > > These strings are not terminated with '\0' if from is longer than
> > > the sizeof to.
> >
> > Did not do it on purpose as the "to" elements are either calloc'd or memset to
> > '0' explicitly in the library. Thats the reason I mentioned "scaled down" :)
>
> Ahh, sounds good.
>
> > > > +#define safestrncpy(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncpy(to, from, maxsize-1); \
> > > > +} while (0)
> > > > +
> > > > +#define safestrncat(to, from, maxsize) \
> > > > +do { \
> > > > + to[maxsize-1] = '\0'; \
> > > > + strncat(to, from, maxsize - strlen(to)-1); \
> > > > +} while (0)
> > >
> > > We all expect a similar behavior like strncat/strncpy according to the
> > > names, but these macros are limiting by the target size and do not limit
> > > the count of chars copied.
> > > This is confusing I think and suggest using a different name like
> > > 'safestrcopymax()' or something.
> >
> > Good point.. will make the change
>
> Nice. I've had these *n* names too and I forgot about the logic and only
> 10 days later I introduced a ugly bug cause I can't limit the count of
> copied chars :)
Inlined is the patch for this... applies on the earlier _BIG_ patch.
2004-03-12 11:57:36 +03:00
safestrcpymax ( device_name , cur - > name , SYSFS_NAME_LEN ) ;
2004-03-12 11:57:30 +03:00
dlist_unshift_sorted ( list , device_name , sort_char ) ;
2003-10-21 12:19:14 +04:00
}
}
sysfs_close_directory ( dir ) ;
return list ;
}
2003-12-16 08:53:28 +03:00
/**
* sysfs_path_is_dir : Check if the path supplied points to a directory
* @ path : path to validate
* Returns 0 if path points to dir , 1 otherwise
*/
2004-03-12 11:57:30 +03:00
int sysfs_path_is_dir ( const char * path )
2003-12-16 08:53:28 +03:00
{
struct stat astats ;
if ( path = = NULL ) {
errno = EINVAL ;
return 1 ;
}
if ( ( lstat ( path , & astats ) ) ! = 0 ) {
dprintf ( " stat() failed \n " ) ;
return 1 ;
}
if ( S_ISDIR ( astats . st_mode ) )
return 0 ;
2004-01-15 09:21:38 +03:00
2003-12-16 08:53:28 +03:00
return 1 ;
}
/**
* sysfs_path_is_link : Check if the path supplied points to a link
* @ path : path to validate
* Returns 0 if path points to link , 1 otherwise
*/
2004-03-12 11:57:30 +03:00
int sysfs_path_is_link ( const char * path )
2003-12-16 08:53:28 +03:00
{
struct stat astats ;
if ( path = = NULL ) {
errno = EINVAL ;
return 1 ;
}
if ( ( lstat ( path , & astats ) ) ! = 0 ) {
dprintf ( " stat() failed \n " ) ;
return 1 ;
}
if ( S_ISLNK ( astats . st_mode ) )
return 0 ;
2004-01-15 09:21:38 +03:00
2003-12-16 08:53:28 +03:00
return 1 ;
}
/**
* sysfs_path_is_file : Check if the path supplied points to a file
* @ path : path to validate
* Returns 0 if path points to file , 1 otherwise
*/
2004-03-12 11:57:30 +03:00
int sysfs_path_is_file ( const char * path )
2003-12-16 08:53:28 +03:00
{
struct stat astats ;
if ( path = = NULL ) {
errno = EINVAL ;
return 1 ;
}
if ( ( lstat ( path , & astats ) ) ! = 0 ) {
dprintf ( " stat() failed \n " ) ;
return 1 ;
}
if ( S_ISREG ( astats . st_mode ) )
return 0 ;
2004-01-15 09:21:38 +03:00
2003-12-16 08:53:28 +03:00
return 1 ;
}