View | Details | Raw Unified | Return to bug 267760 | Differences between
and this patch

Collapse All | Expand All

(-)dialects/freebsd/dnode.c (-3 / +11 lines)
Lines 313-318 Link Here
313
	char *dp, *np, tbuf[1024];
313
	char *dp, *np, tbuf[1024];
314
	struct null_node nu;
314
	struct null_node nu;
315
	int sc = 0;
315
	int sc = 0;
316
	size_t vfs_fsname_len, vfs_dir_len, vfs_path_len;
316
#endif	/* defined(HASNULLFS) */
317
#endif	/* defined(HASNULLFS) */
317
318
318
	int proc_pid = 0;
319
	int proc_pid = 0;
Lines 465-473 Link Here
465
	     * /original_mountpoint/path/to/file
466
	     * /original_mountpoint/path/to/file
466
	     * ------fsname--------
467
	     * ------fsname--------
467
	     */
468
	     */
468
	    memmove(&vfs_path[strlen(vfs->fsname) + 1], &vfs_path[strlen(vfs->dir) + 1],
469
	    vfs_fsname_len = strlen(vfs->fsname);
469
		strlen(vfs_path) - strlen(vfs->dir) + 1);
470
	    vfs_dir_len = strlen(vfs->dir);
470
	    memcpy(vfs_path, vfs->fsname, strlen(vfs->fsname));
471
	    vfs_path_len = strlen(vfs_path);
472
473
            if (vfs_path_len >= vfs_dir_len) {
474
		memmove(&vfs_path[vfs_fsname_len], &vfs_path[vfs_dir_len],
475
		    vfs_path_len - vfs_dir_len + 1);
476
		memcpy(vfs_path, vfs->fsname, vfs_fsname_len);
477
	    }
478
471
	    goto process_overlaid_node;
479
	    goto process_overlaid_node;
472
#endif	/* defined(HASNULLFS) */
480
#endif	/* defined(HASNULLFS) */
473
481

Return to bug 267760