Patchwork makedevs: Do not return error if the fifo exisits

login
register
mail settings
Submitter Saul Wold
Date Oct. 1, 2013, 4:51 p.m.
Message ID <1380646260-15245-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/59165/
State New
Headers show

Comments

Saul Wold - Oct. 1, 2013, 4:51 p.m.
This ensures that makedevs will not cause image creation failures
when it encounters a pipe (fifo) that exists from a previous image.
The other file/device creation code either ignore this error or check
for file type.

[YOCTO #5288]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Phil Blundell - Oct. 1, 2013, 4:56 p.m.
On Tue, 2013-10-01 at 09:51 -0700, Saul Wold wrote:
>  static void add_new_fifo(char *name, char *path, unsigned long uid,
>  				  unsigned long gid, unsigned long mode)
>  {
> -	if (mknod(path, mode, 0))
> +	if (mknod(path, mode, 0) && errno != EEXIST)
>  		error_msg_and_die("%s: file can not be created with mknod!", path);

Will this do the right thing if the mode has changed from the old to the
new versions?

p.
Mark Hatle - Oct. 1, 2013, 5:01 p.m.
On 10/1/13 11:51 AM, Saul Wold wrote:
> This ensures that makedevs will not cause image creation failures
> when it encounters a pipe (fifo) that exists from a previous image.
> The other file/device creation code either ignore this error or check
> for file type.
>
> [YOCTO #5288]
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
> index 5d2c45b..7b0487f 100644
> --- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
> +++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
> @@ -274,7 +274,7 @@ static void add_new_file(char *name, char *path, unsigned long uid,
>   static void add_new_fifo(char *name, char *path, unsigned long uid,
>   				  unsigned long gid, unsigned long mode)
>   {
> -	if (mknod(path, mode, 0))
> +	if (mknod(path, mode, 0) && errno != EEXIST)
>   		error_msg_and_die("%s: file can not be created with mknod!", path);
>   	chown(path, uid, gid);
>   //	printf("File: %s %s  UID: %ld  GID: %ld  MODE: %04lo\n",
>

Ya, I'm happy with this.  It avoids recreating it if it exists.. no error.

No idea if a warning is reasonable in this case, but I'm happy with the change.

--Mark
Khem Raj - Oct. 1, 2013, 5:07 p.m.
On Oct 1, 2013, at 9:56 AM, Phil Blundell <pb@pbcl.net> wrote:

> On Tue, 2013-10-01 at 09:51 -0700, Saul Wold wrote:
>> static void add_new_fifo(char *name, char *path, unsigned long uid,
>> 				  unsigned long gid, unsigned long mode)
>> {
>> -	if (mknod(path, mode, 0))
>> +	if (mknod(path, mode, 0) && errno != EEXIST)
>> 		error_msg_and_die("%s: file can not be created with mknod!", path);
> 
> Will this do the right thing if the mode has changed from the old to the
> new versions?

and it wont catch dangling symlinks anymore

> 
> p.
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
index 5d2c45b..7b0487f 100644
--- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
@@ -274,7 +274,7 @@  static void add_new_file(char *name, char *path, unsigned long uid,
 static void add_new_fifo(char *name, char *path, unsigned long uid,
 				  unsigned long gid, unsigned long mode)
 {
-	if (mknod(path, mode, 0))
+	if (mknod(path, mode, 0) && errno != EEXIST)
 		error_msg_and_die("%s: file can not be created with mknod!", path);
 	chown(path, uid, gid);
 //	printf("File: %s %s  UID: %ld  GID: %ld  MODE: %04lo\n",