ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/BeOS/extfs_beos.cpp

Comparing BasiliskII/src/BeOS/extfs_beos.cpp (file contents):
Revision 1.4 by cebix, 1999-10-22T13:57:04Z vs.
Revision 1.7 by cebix, 1999-11-08T17:00:12Z

#	Line 75 | Line 75 | void extfs_exit(void)
75		*  Add component to path name
76		*/
77
78	<	void add_path_component(char *path, const char *component, int max_len)
78	>	void add_path_component(char *path, const char *component)
79		{
80		int l = strlen(path);
81	<	if (l < max_len-1 && path[l-1] != '/') {
81	>	if (l < MAX_PATH_LENGTH-1 && path[l-1] != '/') {
82		path[l] = '/';
83		path[l+1] = 0;
84		}
85	<	strncat(path, component, max_len-1);
85	>	strncat(path, component, MAX_PATH_LENGTH-1);
86		}
87
88
#	Line 283 | Line 283 | int open_rfork(const char *path, int fla
283		// Open temporary file for resource fork
284		char rname[L_tmpnam];
285		tmpnam(rname);
286	<	int rfd = open(rname, O_RDWR | O_CREAT | O_TRUNC, 0664);
286	>	int rfd = open(rname, O_RDWR | O_CREAT | O_TRUNC, 0666);
287		if (rfd < 0) {
288		close(fd);
289		return -1;
#	Line 455 | Line 455 | size_t extfs_write(int fd, void *buffer,
455		}
456		return actual;
457		}
458	+
459	+
460	+	/*
461	+	*  Remove file/directory, returns false on error (and sets errno)
462	+	*/
463	+
464	+	bool extfs_remove(const char *path)
465	+	{
466	+	if (remove(path) < 0) {
467	+	if (errno == EISDIR)
468	+	return rmdir(path) == 0;
469	+	else
470	+	return false;
471	+	}
472	+	return true;
473	+	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines