Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unalias should exit with non-zero status on error #910

Merged
merged 2 commits into from Sep 25, 2018
Merged

unalias should exit with non-zero status on error #910

merged 2 commits into from Sep 25, 2018

Conversation

siteshwar
Copy link
Contributor

No description provided.

@@ -1238,6 +1241,8 @@ static_fn int unall(int argc, char **argv, Dt_t *troot, Shell_t *shp) {
nv_delete(np, dp, NV_NOFREE);
} else if (isfun && !(np->nvalue.rp && np->nvalue.rp->running)) {
nv_delete(np, troot, 0);
} else if (type == ALIAS) {
nv_delete(np, troot, 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is why I really wonder if the people who were writing this code were smoking crack. You are apparently relying on nv_delete() to longjmp() on error. That is what the debug printf statements I added seem to suggest. I see nothing in the nv_delete() implementation to suggest that is a valid assumption. So I'd like to see a comment added here, and in the nv_delete() definition, explaining this magic.

Also, there is this block in the nv_delete() implementation:


#if 0
                else
                {
                        sfprintf(sfstderr,"%s not deleted\n",nv_name(np));
                        sfsync(sfstderr);
                }
#endif

Which implies that if I change that to #if 1 I should see an error message in this case. Yet I do not.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, The rest of the change looks okay. I just don't like, or understand, the magic "return non-zero" from nv_delete() in this case. I could live with that magic if it was documented. But it seems to me like a better modification, albeit outside the scope of this change, is to have nv_delete() return a status and have the caller decide if a long jump is warranted.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@siteshwar In case it wasn't clear I am obviously not blaming you for the magic behavior of nv_delete() with regard to doing a longjmp() on error. My concern is that

a) you are taking advantage of it without an explicit comment to that effect, and

b) it doesn't write a message to stderr.

But those are minor objections. My main concernt is that the absence of the } else if (type == ALIAS) { block doesn't actually affect whether the alias is removed. Only whether the action results in a zero (success) or non-zero (failure) exit status. Which suggests that the actual removal of the alias is occurring before your newly introduced block is being run. And the execution of that block is solely for the effect of returning a failure status (presumably due to the undocumented longjmp).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b) it doesn't write a message to stderr.

I updated this PR to write a message on stderr. It does not have to be done inside nv_delete().

unalias should exit with non-zero status while trying to unalias an
undefined alias and show an error message.

Resolves: #909
@krader1961
Copy link
Contributor

LGTM. Much better now that it doesn't rely on the magic longjmp.

@siteshwar siteshwar merged commit 2bb160b into att:master Sep 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants