Skip to contentSkip to conversation

entry.c: Use strerror() to print error info when possible

PATCH In review Luiz Fernando N. Capitulino 3 participants 5 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 entry.c: Use strerror() to print error info when possible

---
 entry.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
entry.c +6 -5
index d72f811..c36c09d 100644
@@ -19,7 +19,8 @@ static void create_directories(const char *path, struct checkout *state)
 				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
 					continue; /* ok */
 			}
-			die("cannot create directory at %s", buf);
+			die("cannot create directory at %s (%s)", buf,
+			    strerror(errno));
 		}
 	}
 	free(buf);
@@ -33,7 +34,7 @@ static void remove_subtree(const char *path)
 	char *name;
 	
 	if (!dir)
-		die("cannot opendir %s", path);
+		die("cannot opendir %s (%s)", path, strerror(errno));
 	strcpy(pathbuf, path);
 	name = pathbuf + strlen(path);
 	*name++ = '/';
@@ -45,15 +46,15 @@ static void remove_subtree(const char *path)
 			continue;
 		strcpy(name, de->d_name);
 		if (lstat(pathbuf, &st))
-			die("cannot lstat %s", pathbuf);
+			die("cannot lstat %s (%s)", pathbuf, strerror(errno));
 		if (S_ISDIR(st.st_mode))
 			remove_subtree(pathbuf);
 		else if (unlink(pathbuf))
-			die("cannot unlink %s", pathbuf);
+			die("cannot unlink %s (%s)", pathbuf, strerror(errno));
 	}
 	closedir(dir);
 	if (rmdir(path))
-		die("cannot rmdir %s", path);
+		die("cannot rmdir %s (%s)", path, strerror(errno));
 }
 
 static int create_file(const char *path, unsigned int mode)
Signature · 1 line
1.5.1.1.85.geed2-dirty
#1 lore raw

Luiz Fernando N. Capitulino, Sun, Apr 15, 2007 23:56:19 +0200:

Quoted 11 lines
---
 entry.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
entry.c +0 -0
index d72f811..c36c09d 100644

entry.c static void create_directories(const char *path, struct checkout *state) · line 23

Quoted 6 lines
entry.c +2 -1
@@ -19,7 +19,8 @@ static void create_directories(const char *path, struct checkout *state)
 				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
 					continue; /* ok */
 			}
-			die("cannot create directory at %s", buf);
+			die("cannot create directory at %s (%s)", buf,
+			    strerror(errno));

This errno is not very useful, as it may come from the stat above, and you provided no way to figure out what was the syscall (the mkdir or the stat) which failed. Also, the errnos of unlink or mkdir just above the stat are just lost.

It is not worse than before, but not very much better either, and probably confusing. I suggest you just leave this one as it is.

#2 lore raw

Em Mon, 16 Apr 2007 01:00:20 +0200
Alex Riesen <[email protected]> escreveu:

| Luiz Fernando N. Capitulino, Sun, Apr 15, 2007 23:56:19 +0200:
| > 
| > Signed-off-by: Luiz Fernando N. Capitulino <[email protected]>
| > ---
| >  entry.c |   11 ++++++-----
| >  1 files changed, 6 insertions(+), 5 deletions(-)
| > 
| > diff --git a/entry.c b/entry.c
| > index d72f811..c36c09d 100644
| > --- a/entry.c
| > +++ b/entry.c
| > @@ -19,7 +19,8 @@ static void create_directories(const char *path, struct checkout *state)
| >  				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
| >  					continue; /* ok */
| >  			}
| > -			die("cannot create directory at %s", buf);
| > +			die("cannot create directory at %s (%s)", buf,
| > +			    strerror(errno));
| 
| This errno is not very useful, as it may come from the stat above, and
| you provided no way to figure out what was the syscall (the mkdir or
| the stat) which failed. Also, the errnos of unlink or mkdir just above
| the stat are just lost.
| 
| It is not worse than before, but not very much better either, and
| probably confusing. I suggest you just leave this one as it is.

Will do, thanks for reviewing Alex.

#3 lore raw
In reply to Luiz Fernando N. Capitulino

"Luiz Fernando N. Capitulino" <[email protected]>

Quoted 10 lines · writes:
---
 entry.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
entry.c +0 -0
index d72f811..c36c09d 100644

entry.c static void create_directories(const char *path, struct checkout *state) · line 26

Quoted 9 lines
entry.c +2 -1
@@ -19,7 +19,8 @@ static void create_directories(const char *path, struct checkout *state)
 				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
 					continue; /* ok */
 			}
-			die("cannot create directory at %s", buf);
+			die("cannot create directory at %s (%s)", buf,
+			    strerror(errno));
 		}
 	}
 	free(buf);

This hunk is wrong; stat() you see in the context could have been what failed the last before this die().

I do not think other places you patched do not share the issue.

#4 lore raw

Em Sun, 15 Apr 2007 15:54:47 -0700
Junio C Hamano <[email protected]> escreveu:

| "Luiz Fernando N. Capitulino" <[email protected]>
| writes:
| 
| > Signed-off-by: Luiz Fernando N. Capitulino <[email protected]>
| > ---
| >  entry.c |   11 ++++++-----
| >  1 files changed, 6 insertions(+), 5 deletions(-)
| >
| > diff --git a/entry.c b/entry.c
| > index d72f811..c36c09d 100644
| > --- a/entry.c
| > +++ b/entry.c
| > @@ -19,7 +19,8 @@ static void create_directories(const char *path, struct checkout *state)
| >  				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
| >  					continue; /* ok */
| >  			}
| > -			die("cannot create directory at %s", buf);
| > +			die("cannot create directory at %s (%s)", buf,
| > +			    strerror(errno));
| >  		}
| >  	}
| >  	free(buf);
| 
| This hunk is wrong; stat() you see in the context could have
| been what failed the last before this die().

You right, will try to read the code more carefully before
patching.

| I do not think other places you patched do not share the issue.

Other places seems ok, I'll review and re-send along with other
patches I'm working on.

Thanks a lot for the feedback.