Macintosh-SW
/
mpw-shell
mirror of https://github.com/ksherlock/mpw-shell.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

be more helpful if mpw / Startup file does not exist.

This commit is contained in:
Kelvin Sherlock 2016-08-06 17:55:26 -04:00
parent 76980a6e06
commit e2affa1bdd
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mpw-shell.cpp
View File

@ -50,15 +50,23 @@ fs::path root() {
if (!cp || !*cp) {
auto pw = getpwuid(getuid());
if (!pw) {
fprintf(stderr,"Unable to determine home directory\n.");
fprintf(stderr,"### Unable to determine home directory\n.");
exit(EX_NOUSER);
}
cp = pw->pw_dir;
}
root = cp;
//if (root.back() != '/') root.push_back('/');
//root += "mpw/";
root /= "mpw/";
fs::error_code ec;
fs::file_status st = status(root, ec);
if (!fs::exists(st)) {
fprintf(stderr, "### Warning: %s does not exist.\n", root.c_str());
}
else if (!fs::is_directory(st)) {
fprintf(stderr, "### Warning: %s is not a directory.\n", root.c_str());
}
}
return root;
}
@ -521,8 +529,13 @@ int main(int argc, char **argv) {
if (!cflag) fprintf(stdout, "MPW Shell " VERSION "\n");
if (!fflag) {
fs::path startup = root() / "Startup";
e.startup(true);
read_file(p1, root() / "Startup");
try {
read_file(p1, startup);
} catch (const std::system_error &ex) {
fprintf(stderr, "### %s: %s\n", startup.c_str(), ex.what());
}
e.startup(false);
}