claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes in test/driver programs

Browse Source
This commit is contained in:
R. Bernstein
2010-01-18 03:08:30 -05:00
parent 3bd7752137
commit 3bdc6820e5
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/driver/MSWindows/win32.c
View File

@@ -659,7 +659,7 @@ get_arg_win32 (void *p_user_data, const char key[])
} else if (!strcmp (key, "access-mode")) { } else if (!strcmp (key, "access-mode")) {
switch (p_env->access_mode) { switch (p_env->access_mode) {
case _AM_IOCTL: case _AM_IOCTL:
return "IOCTL"; return "ioctl";
case _AM_ASPI: case _AM_ASPI:
return "ASPI"; return "ASPI";
case _AM_MMC_RDWR: case _AM_MMC_RDWR:

34
test/driver/realpath.c
View File

@@ -85,9 +85,8 @@ main(int argc, const char *argv[])
{ {
char *psz_tmp_subdir; char *psz_tmp_subdir;
char *psz_orig_file; char *psz_orig_file;
char orig_file[PATH_MAX+1]; char tmp_dir[PATH_MAX+1] = {0};
char tmp_dir[PATH_MAX+1]; char tmp_subdir[PATH_MAX+1] = {0};
char tmp_subdir[PATH_MAX+1];
char psz_file_check[PATH_MAX+1]; char psz_file_check[PATH_MAX+1];
char *psz_last_slash; char *psz_last_slash;
unsigned int i_last_slash; unsigned int i_last_slash;
@@ -101,26 +100,41 @@ main(int argc, const char *argv[])
printf("extract parent directory from temporary directory name\n"); printf("extract parent directory from temporary directory name\n");
exit(77); exit(77);
} }
if (-1 == check_rc(mkdir(psz_tmp_subdir, 0755),
"mkdir", psz_tmp_subdir))
exit(77);
cdio_realpath(psz_tmp_subdir, tmp_subdir); cdio_realpath(psz_tmp_subdir, tmp_subdir);
if (0 == strlen(tmp_subdir)) {
fprintf(stderr, "cdio_realpath on temp directory %s failed\n",
psz_tmp_subdir);
exit(1);
}
psz_last_slash = strrchr(tmp_subdir, MY_DIR_SEPARATOR); psz_last_slash = strrchr(tmp_subdir, MY_DIR_SEPARATOR);
i_last_slash = psz_last_slash - tmp_subdir + 1; i_last_slash = psz_last_slash - tmp_subdir + 1;
memcpy(tmp_dir, tmp_subdir, i_last_slash); memcpy(tmp_dir, tmp_subdir, i_last_slash);
tmp_dir[i_last_slash] = '\0'; tmp_dir[i_last_slash] = '\0';
printf("Temp directory is %s\n", tmp_dir); printf("Temp directory is %s\n", tmp_dir);
if (-1 == check_rc(mkdir(psz_tmp_subdir, 0755),
"mkdir", psz_tmp_subdir))
exit(77);
psz_orig_file = get_temporary_name(NULL, "file"); psz_orig_file = get_temporary_name(NULL, "file");
if (NULL != psz_orig_file) { if (NULL != psz_orig_file) {
FILE *fp = fopen(psz_orig_file, "w"); FILE *fp = fopen(psz_orig_file, "w");
char orig_file[PATH_MAX+1] = {0};
int rc; int rc;
char symlink_file[PATH_MAX+1]; char symlink_file[PATH_MAX+1] = {0};
fprintf(fp, "testing\n"); fprintf(fp, "testing\n");
fclose(fp); fclose(fp);
cdio_realpath(psz_orig_file, orig_file); cdio_realpath(psz_orig_file, orig_file);
if (0 == strlen(orig_file)) {
fprintf(stderr, "cdio_realpath on temp file %s failed\n",
psz_orig_file);
exit(2);
}
psz_symlink_file = get_temporary_name(NULL, "symlink file"); psz_symlink_file = get_temporary_name(NULL, "symlink file");
rc = check_rc(symlink(psz_orig_file, psz_symlink_file), rc = check_rc(symlink(psz_orig_file, psz_symlink_file),
"symlink", psz_symlink_file); "symlink", psz_symlink_file);
@@ -131,7 +145,7 @@ main(int argc, const char *argv[])
if (0 != strncmp(psz_file_check, orig_file, PATH_MAX)) { if (0 != strncmp(psz_file_check, orig_file, PATH_MAX)) {
fprintf(stderr, "simple cdio_realpath failed: %s vs %s\n", fprintf(stderr, "simple cdio_realpath failed: %s vs %s\n",
psz_file_check, orig_file); psz_file_check, orig_file);
exit(1); exit(3);
} }
check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file); check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
} }
@@ -145,7 +159,7 @@ main(int argc, const char *argv[])
if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) { if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n", fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
psz_file_check, symlink_file); psz_file_check, symlink_file);
exit(2); exit(4);
} }
check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file); check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
} }