admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

suppress a warning and fix a possible segv.

Browse Source
This commit is contained in:
Tomoyuki Sahara
2013-09-26 10:59:40 +09:00
parent e2b0606752
commit e27fb544df
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file.c
+15 -25
View File
@@ -235,41 +235,31 @@ mrb_file_is_absolute_path(const char *path)
static mrb_value
mrb_file__gethome(mrb_state *mrb, mrb_value klass)
{
mrb_value username, result;
char *cuser, *home;
mrb_value username;
int argc;
struct passwd *pwd;
char *home;
argc = mrb_get_args(mrb, "|S", &username);
if (argc == 0) {
home = getenv("HOME");
} else {
cuser = mrb_str_to_cstr(mrb, username);
if ((pwd = getpwnam(cuser)) == NULL) {
if (home == NULL) {
return mrb_nil_value();
} else {
home = pwd->pw_dir;
}
}
if (home == NULL) {
return mrb_nil_value();
}
if (!mrb_file_is_absolute_path(home)) {
if (argc && strlen(cuser) > 0) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "non-absolute home of ~%s", cuser);
} else {
if (!mrb_file_is_absolute_path(home)) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "non-absolute home");
}
} else {
const char *cuser = mrb_str_to_cstr(mrb, username);
struct passwd *pwd = getpwnam(cuser);
if (pwd == NULL) {
return mrb_nil_value();
}
home = pwd->pw_dir;
if (!mrb_file_is_absolute_path(home)) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "non-absolute home of ~%S", username);
}
}
result = mrb_str_buf_new(mrb, MAXPATHLEN);
strncpy(RSTRING_PTR(result), home, MAXPATHLEN);
mrb_str_resize(mrb, result, strlen(RSTRING_PTR(result)));
return result;
return mrb_str_new_cstr(mrb, home);
}
void