Attachment #8898 for bug #18461

View | Details | Raw Unified | Return to bug 18461
Collapse All | Expand All

Lines 276-281 Link Here

(-)/usr/src/etc/defaults/rc.conf (+1 lines)
276	svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO).	276	svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO).
277	osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO).	277	osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO).
278	rand_irqs="NO" # Stir the entropy pool (like "5 11" or NO).	278	rand_irqs="NO" # Stir the entropy pool (like "5 11" or NO).
		279	vi_recover="/var/tmp/vi.recover" # The directory where recovery files are stored.
279	clear_tmp_enable="NO" # Clear /tmp at startup.	280	clear_tmp_enable="NO" # Clear /tmp at startup.
280	ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib"	281	ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib"
281	# shared library search paths	282	# shared library search paths




echo '.'

# Recover vi editor files.
if [ -n "$vi_recover" ]; then
	if [ "$vi_recover" != /var/tmp/vi.recover ]; then
		if [ -s /etc/vi.exrc ]; then
			# be conservative
			sed -e 's/recdir=[^ 	]*[ 	]*//' \
			    -e '/^[ 	]*set[ 	]*$/d' \
				/etc/vi.exrc > /tmp/vi.exrc.$$ &&
			cp /tmp/vi.exrc.$$ /etc/vi.exrc &&
			rm /tmp/vi.exrc.$$
		fi
		echo set recdir=$vi_recover >> /etc/vi.exrc
	fi
else
	vi_recover=/var/tmp/vi.recover # just in case
fi
find $vi_recover ! -type f -a ! -type d -delete
vibackup=`echo $vi_recover/vi.*`
if [ "${vibackup}" != '$vi_recover/vi.*' ]; then
	echo 'Recovering vi editor sessions'
	for i in $vi_recover/vi.*; do
		# Only test files that are readable.
		if [ ! -r "${i}" ]; then
			continue


	# It is possible to get incomplete recovery files, if the editor
	# crashes at the right time.
	virecovery=`echo $vi_recover/recover.*`
	if [ "${virecovery}" != "$vi_recover/recover.*" ]; then
		for i in $vi_recover/recover.*; do
			# Only test files that are readable.
			if [ ! -r "${i}" ]; then
				continue

		done
	fi
fi
mkdir -m 1777 -p $vi_recover

# Make a bounds file for msgs(1) if there isn't one already
# "Delete important files with symlink" security hole?

Return to bug 18461

Lines 413-423 Link Here

(-)/usr/src/etc/rc (-7 / +23 lines)
413	echo '.'	413	echo '.'
414		414
415	# Recover vi editor files.	415	# Recover vi editor files.
416	find /var/tmp/vi.recover ! -type f -a ! -type d -delete	416	if [ -n "$vi_recover" ]; then
417	vibackup=`echo /var/tmp/vi.recover/vi.*`	417	if [ "$vi_recover" != /var/tmp/vi.recover ]; then
418	if [ "${vibackup}" != '/var/tmp/vi.recover/vi.*' ]; then	418	if [ -s /etc/vi.exrc ]; then
		419	# be conservative
		420	sed -e 's/recdir=[^ ][ ]//' \
		421	-e '/^[ ]set[ ]$/d' \
		422	/etc/vi.exrc > /tmp/vi.exrc.$$ &&
		423	cp /tmp/vi.exrc.$$ /etc/vi.exrc &&
		424	rm /tmp/vi.exrc.$$
		425	fi
		426	echo set recdir=$vi_recover >> /etc/vi.exrc
		427	fi
		428	else
		429	vi_recover=/var/tmp/vi.recover # just in case
		430	fi
		431	find $vi_recover ! -type f -a ! -type d -delete
		432	vibackup=`echo $vi_recover/vi.*`
		433	if [ "${vibackup}" != '$vi_recover/vi.*' ]; then
419	echo 'Recovering vi editor sessions'	434	echo 'Recovering vi editor sessions'
420	for i in /var/tmp/vi.recover/vi.*; do	435	for i in $vi_recover/vi.*; do
421	# Only test files that are readable.	436	# Only test files that are readable.
422	if [ ! -r "${i}" ]; then	437	if [ ! -r "${i}" ]; then
423	continue	438	continue
Lines 432-440 Link Here
432		447
433	# It is possible to get incomplete recovery files, if the editor	448	# It is possible to get incomplete recovery files, if the editor
434	# crashes at the right time.	449	# crashes at the right time.
435	virecovery=`echo /var/tmp/vi.recover/recover.*`	450	virecovery=`echo $vi_recover/recover.*`
436	if [ "${virecovery}" != "/var/tmp/vi.recover/recover.*" ]; then	451	if [ "${virecovery}" != "$vi_recover/recover.*" ]; then
437	for i in /var/tmp/vi.recover/recover.*; do	452	for i in $vi_recover/recover.*; do
438	# Only test files that are readable.	453	# Only test files that are readable.
439	if [ ! -r "${i}" ]; then	454	if [ ! -r "${i}" ]; then
440	continue	455	continue
Lines 452-457 Link Here
452	done	467	done
453	fi	468	fi
454	fi	469	fi
		470	mkdir -m 1777 -p $vi_recover
455		471
456	# Make a bounds file for msgs(1) if there isn't one already	472	# Make a bounds file for msgs(1) if there isn't one already
457	# "Delete important files with symlink" security hole?	473	# "Delete important files with symlink" security hole?