Navigation

Changeset 4808

Timestamp:

09/14/07 18:18:20 (1 year ago)

Author:

vboxsync

Message:

Added an RTErrnoConvertFromErr function to simplify error management inside the Linux Additions kernel modules

Files:

r4475	r4808
147	147	*/
148	148	RTDECL(int) RTErrConvertFromWin32(unsigned uNativeCode);
	149
	150	/**
	151	* Converts an iprt status code to a Posix error code.
	152	*
	153	* @returns a Posix error code.
	154	* @param iErr iprt status code.
	155	*/
	156	RTDECL(unsigned) RTErrnoConvertFromErr(int iErr);
149	157
150	158

r4709	r4808
46	46	# folders kernel modules.
47	47	$(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
48		$(INSTARGET_vboxmod-bin) \
	48	$(PATH_OBJ)/src/VBox/Additions/linux/module/vboxadd/vboxadd$(TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF) \
	49	$(PATH_OBJ)/src/VBox/Additions/linux/sharedfolders/vboxvfs/vboxvfs$(TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF) \
49	50	$(PATH_BIN)/additions/vboxadd-timesync \
50	51	$(PATH_BIN)/additions/vboxadd-xclient \

r4739	r4808
31	31	r0drv/linux/alloc-r0drv-linux.o \
32	32	r0drv/linux/semaphore-r0drv-linux.o \
	33	RTErrnoConvertFromErr.o \
33	34	divdi3.o \
34	35	moddi3.o \

r4796	r4808
491	491	LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
492	492	path->String.utf8, rc));
493
494		switch (rc) {
495		case VERR_PATH_NOT_FOUND:
496		err = -ENOENT;
497		break;
498
499		case VERR_DIR_NOT_EMPTY:
500		err = -ENOTEMPTY;
501		break;
502
503		default:
504		err = -EPROTO;
505		LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
506		path->String.utf8, rc));
507		break;
508		}
	493	err = -RTErrnoConvertFromErr(rc);
509	494	goto fail1;
510	495	}
…	…
576	561	} else {
577	562	LogFunc(("vboxCallRename failed rc=%Vrc\n", rc));
578		switch (rc) {
579		/** @todo we need a function to convert VBox error
580		codes back to Linux. */
581		case VERR_ACCESS_DENIED:
582		err = -EACCES;
583		break;
584		case VERR_DEV_IO_ERROR:
585		err = -EBUSY;
586		break;
587		case VERR_INVALID_POINTER:
588		err = -EFAULT;
589		break;
590		case VERR_FILE_NOT_FOUND:
591		case VERR_PATH_NOT_FOUND:
592		err = -ENOENT;
593		break;
594		default:
595		err = -EPROTO;
596		}
	563	err = -RTErrnoConvertFromErr(err);
597	564	}
598	565	if (0 != err) {

r4729	r4808
64	64	${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
65	65	${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
	66	${PATH_ROOT}/src/VBox/Runtime/RTErrnoConvertFromErr.cpp=>RTErrnoConvertFromErr.c \
66	67	${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/Makefile.module=>Makefile \
67	68	${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/dirops.c=>dirops.c \

r4735	r4808
569	569
570	570	default:
571		err = -~~EPROTO~~;
	571	err = -RTErrnoConvertFromErr(rc);
572	572	LogFunc(("vboxCallDirInfo failed rc=%Vrc\n", rc));
573	573	goto fail1;