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.

Sign up for GitHub

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

push error messages to stderr #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+51 −51
Open

push error messages to stderr #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
706e31a
push error messages to stderr
israpps Jan 4, 2025
f79e7ae
[PS1]: Print errors to stderr
israpps Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ static int cmd_import(const char *input)

r = mcio_mcMkDir(ps2md->filename);
if (r < 0)
printf("Error: can't create directory '%s'... (%d)\n", ps2md->filename, r);
fprintf(stderr, "Error: can't create directory '%s'... (%d)\n", ps2md->filename, r);
else
mcio_mcClose(r);

Expand Down Expand Up @@ -639,7 +639,7 @@ static int cmd_psu_import(const char *input)

r = mcio_mcMkDir(psu_entry.name);
if (r < 0)
printf("Error: can't create directory '%s'... (%d)\n", psu_entry.name, r);
fprintf(stderr, "Error: can't create directory '%s'... (%d)\n", psu_entry.name, r);
else
mcio_mcClose(r);

Expand Down Expand Up @@ -847,120 +847,120 @@ int main(int argc, char **argv)
}

if (read_buffer(argv[1], &data, &dsize) < 0) {
printf("Error: failed to open VMC file... (%s)\n", argv[1]);
fprintf(stderr, "Error: failed to open VMC file... (%s)\n", argv[1]);
return 1;
}

r = mcio_init(data, dsize);
/*if (r == sceMcResNoFormat)
printf("Error: memory card not formated...\n");*/
fprintf(stderr, "Error: memory card not formated...\n");*/
if ((r != sceMcResNoFormat) && (r < 0)) {
printf("Error: no PS2 Memory Card detected... (%d)\n", r);
fprintf(stderr, "Error: no PS2 Memory Card detected... (%d)\n", r);
}
else {
if (cmd == CMD_MCINFO) {
r = cmd_mcinfo();
if (r < 0)
printf("Error: can't get MC infos... (%d)\n", r);
fprintf(stderr, "Error: can't get MC infos... (%d)\n", r);
}
else if (cmd == CMD_MCFREE) {
r = cmd_mcfree();
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't get MC free space... (%d)\n", r);
fprintf(stderr, "Error: can't get MC free space... (%d)\n", r);
}
else if (cmd == CMD_MCIMG) {
r = cmd_mcimg(cmd_args[0]);
if (r < 0)
printf("Error: can't create image file... (%d)\n", r);
fprintf(stderr, "Error: can't create image file... (%d)\n", r);
}
else if (cmd == CMD_ECC_IMG) {
r = cmd_ecc_img(cmd_args[0]);
if (r < 0)
printf("Error: can't create image file... (%d)\n", r);
fprintf(stderr, "Error: can't create image file... (%d)\n", r);
}
else if (cmd == CMD_ICONS_PNG) {
r = cmd_export_icons_png(cmd_args[0]);
if (r < 0)
printf("Error: can't export icons... (%d)\n", r);
fprintf(stderr, "Error: can't export icons... (%d)\n", r);
}
else if (cmd == CMD_PSU_EXPORT) {
r = cmd_export(cmd_args[0], cmd_args[1]);
if (r < 0)
printf("Error: can't export save to PSU... (%d)\n", r);
fprintf(stderr, "Error: can't export save to PSU... (%d)\n", r);
}
else if (cmd == CMD_MCFORMAT) {
r = cmd_mcformat();
if (r < 0)
printf("Error: can't format MC... (%d)\n", r);
fprintf(stderr, "Error: can't format MC... (%d)\n", r);
}
else if (cmd == CMD_LIST) {
r = cmd_list(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r == sceMcResNoEntry)
printf("Error: path '%s' not found...\n", cmd_args[0]);
fprintf(stderr, "Error: path '%s' not found...\n", cmd_args[0]);
else if (r == sceMcResNotDir)
printf("Error: path '%s' is not a directory...\n", cmd_args[0]);
fprintf(stderr, "Error: path '%s' is not a directory...\n", cmd_args[0]);
else if (r < 0)
printf("Error: can't list directory '%s' (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't list directory '%s' (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_EXTRACT) {
r = cmd_extract(cmd_args[0], cmd_args[1]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r == sceMcResNotFile)
printf("Error: '%s' is not a file...\n", cmd_args[0]);
fprintf(stderr, "Error: '%s' is not a file...\n", cmd_args[0]);
else if (r < 0)
printf("Error: can't extract file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't extract file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_INJECT) {
r = cmd_inject(cmd_args[0], cmd_args[1]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't inject file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't inject file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_MKDIR) {
r = cmd_mkdir(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't create directory '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't create directory '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_RMDIR) {
r = cmd_rmdir(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't remove directory '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't remove directory '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_REMOVE) {
r = cmd_remove(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_CROSSLINK) {
r = cmd_crosslink(cmd_args[0], cmd_args[1]);
if (r < 0)
printf("Error: can't crosslink file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't crosslink file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_PSU_IMPORT) {
r = cmd_psu_import(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't import file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't import file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_PSV_IMPORT) {
r = cmd_import(cmd_args[0]);
if (r == sceMcResNoFormat)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't import file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't import file '%s'... (%d)\n", cmd_args[0], r);
}
}

Expand Down
36 changes: 18 additions & 18 deletions src/ps1main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,72 +395,72 @@ int main(int argc, char **argv)
r = openMemoryCard(argv[1], 0);

if (!r) {
printf("Error: no PS1 Memory Card detected... (%s)\n", argv[1]);
fprintf(stderr, "Error: no PS1 Memory Card detected... (%s)\n", argv[1]);
}
else {
if (cmd == CMD_MCINFO) {
r = cmd_mcinfo();
if (r < 0)
printf("Error: can't get MC infos... (%d)\n", r);
fprintf(stderr, "Error: can't get MC infos... (%d)\n", r);
}
else if (cmd == CMD_MCFREE) {
r = cmd_mcfree();
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't get MC free space... (%d)\n", r);
fprintf(stderr, "Error: can't get MC free space... (%d)\n", r);
}
else if (cmd == CMD_RAW_IMG || cmd == CMD_GME_IMG || cmd == CMD_VGS_IMG || cmd == CMD_VMP_IMG) {
r = cmd_mcimg(cmd_args[0], cmd - 2);
if (r < 0)
printf("Error: can't create image file... (%d)\n", r);
fprintf(stderr, "Error: can't create image file... (%d)\n", r);
}
else if (cmd == CMD_PSV_EXPORT) {
r = cmd_psv_export(cmd_args[0]);
if (r < 0)
printf("Error: can't export save to PSV... (%d)\n", r);
fprintf(stderr, "Error: can't export save to PSV... (%d)\n", r);
}
else if (cmd == CMD_MCFORMAT) {
r = cmd_mcformat();
if (r < 0)
printf("Error: can't format MC... (%d)\n", r);
fprintf(stderr, "Error: can't format MC... (%d)\n", r);
}
else if (cmd == CMD_LIST) {
r = cmd_list();
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r == 99999)
printf("Error: path '%s' not found...\n", cmd_args[0]);
fprintf(stderr, "Error: path '%s' not found...\n", cmd_args[0]);
else if (r < 0)
printf("Error: can't list directory '%s' (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't list directory '%s' (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_INJECT) {
r = cmd_inject(cmd_args[0]);
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r != 0)
printf("Error: can't inject file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't inject file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_ICONS) {
r = cmd_icons(cmd_args[0]);
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_REMOVE) {
r = cmd_remove(cmd_args[0]);
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't remove file '%s'... (%d)\n", cmd_args[0], r);
}
else if (cmd == CMD_AR_EXPORT || cmd == CMD_MCS_EXPORT || cmd == CMD_RAW_EXPORT) {
r = cmd_export(cmd_args[0], cmd_args[1], cmd - 8);
if (r == 99999)
printf("Error: memory card is not formatted!\n");
fprintf(stderr, "Error: memory card is not formatted!\n");
else if (r < 0)
printf("Error: can't export file '%s'... (%d)\n", cmd_args[0], r);
fprintf(stderr, "Error: can't export file '%s'... (%d)\n", cmd_args[0], r);
}
}

Expand Down
Loading