align include/paths: MAILDIR

Change-Id: Ieb50549f8f27af957f67fcb0757690db88fecc8b

commands/mail/mail.c

@@ -26,8 +26,8 @@
 
 #define SHELL		"/bin/sh"
 
-#define DROPNAME 	"/usr/spool/mail/%s"
+#define DROPNAME 	"/var/mail/%s"
-#define LOCKNAME	"/usr/spool/mail/%s.lock"
+#define LOCKNAME	"/var/mail/%s.lock"
 #define LOCKWAIT	5	/* seconds to wait after collision */
 #define LOCKTRIES	4	/* maximum number of collisions */
 

distrib/sets/lists/minix/mi

@@ -83,6 +83,7 @@
 ./etc/devmand/scripts			minix-sys
 ./etc/devmand/scripts/block		minix-sys
 ./etc/devmand/scripts/singlechar	minix-sys
+./etc/gettytab				minix-sys
 ./etc/group				minix-sys
 ./etc/hostname.file			minix-sys
 ./etc/inet.conf				minix-sys
@@ -103,6 +104,7 @@
 ./etc/rc.cd				minix-sys
 ./etc/rc.conf				minix-sys
 ./etc/rc.daemons.dist			minix-sys
+./etc/rc.shutdown			minix-sys
 ./etc/rc.subr				minix-sys
 ./etc/release				minix-sys
 ./etc/resolv.conf			minix-sys
@@ -118,8 +120,6 @@
 ./etc/termcap				minix-sys
 ./etc/ttys				minix-sys
 ./etc/utmp				minix-sys
-./etc/gettytab				minix-sys
-./etc/rc.shutdown			minix-sys
 ./home					minix-sys
 ./home/ast				minix-sys
 ./home/ast/.exrc			minix-sys
@@ -148,9 +148,9 @@
 ./sbin/fsck.ext2			minix-sys
 ./sbin/fsck_ext2fs			minix-sys
 ./sbin/fsck.mfs				minix-sys
-./sbin/input				minix-sys
 ./sbin/halt				minix-sys
 ./sbin/init				minix-sys
+./sbin/input				minix-sys
 ./sbin/is				minix-sys
 ./sbin/isofs				minix-sys
 ./sbin/mfs				minix-sys
@@ -464,13 +464,13 @@
 ./usr/bin/readall			minix-sys	obsolete
 ./usr/bin/readelf			minix-sys	binutils
 ./usr/bin/readlink			minix-sys
-./usr/bin/recwave                       minix-sys
 ./usr/bin/reboot			minix-sys	obsolete
+./usr/bin/recwave			minix-sys
 ./usr/bin/ref				minix-sys	obsolete
 ./usr/bin/remsync			minix-sys
+./usr/bin/renice			minix-sys
 ./usr/bin/repartition			minix-sys
 ./usr/bin/restore			minix-sys
-./usr/bin/renice			minix-sys
 ./usr/bin/rev				minix-sys
 ./usr/bin/rget				minix-sys
 ./usr/bin/rlogin			minix-sys
@@ -548,8 +548,8 @@
 ./usr/bin/unxz				minix-sys
 ./usr/bin/unzip				minix-sys
 ./usr/bin/update			minix-sys
-./usr/bin/users				minix-sys
 ./usr/bin/uptime			minix-sys	obsolete
+./usr/bin/users				minix-sys
 ./usr/bin/uud				minix-sys
 ./usr/bin/uudecode			minix-sys
 ./usr/bin/uue				minix-sys
@@ -1798,10 +1798,10 @@
 ./usr/lib/libfetch.a			minix-sys
 ./usr/lib/libfl.a			minix-sys
 ./usr/lib/libform.a			minix-sys
-./usr/lib/libform.so			minix-sys
-./usr/lib/libform.so.6			minix-sys
-./usr/lib/libform.so.6.0		minix-sys
 ./usr/lib/libform_pic.a			minix-sys
+./usr/lib/libform.so			minix-sys
+./usr/lib/libform.so.6.0		minix-sys
+./usr/lib/libform.so.6			minix-sys
 ./usr/lib/libgcc.a			minix-sys	gcc=45
 ./usr/lib/libgcc_eh.a			minix-sys	gcccmds
 ./usr/lib/libgcc_s.a			minix-sys	gcccmds
@@ -1835,10 +1835,10 @@
 ./usr/lib/libmagic.so.0			minix-sys
 ./usr/lib/libmagic.so			minix-sys
 ./usr/lib/libmenu.a			minix-sys
-./usr/lib/libmenu.so			minix-sys
-./usr/lib/libmenu.so.6			minix-sys
-./usr/lib/libmenu.so.6.0		minix-sys
 ./usr/lib/libmenu_pic.a			minix-sys
+./usr/lib/libmenu.so			minix-sys
+./usr/lib/libmenu.so.6.0		minix-sys
+./usr/lib/libmenu.so.6			minix-sys
 ./usr/lib/libminc.a			minix-sys
 ./usr/lib/libminc_pic.a			minix-sys
 ./usr/lib/libminixfs.a			minix-sys
@@ -2292,8 +2292,8 @@
 ./usr/man/man1/view.1			minix-sys
 ./usr/man/man1/vis.1			minix-sys
 ./usr/man/man1/vol.1			minix-sys
-./usr/man/man1/wall.1			minix-sys
 ./usr/man/man1/wait.1			minix-sys
+./usr/man/man1/wall.1			minix-sys
 ./usr/man/man1/wc.1			minix-sys
 ./usr/man/man1/what.1			minix-sys
 ./usr/man/man1/whatis.1			minix-sys
@@ -3158,10 +3158,10 @@
 ./usr/man/man3/form_field_just.3			minix-sys
 ./usr/man/man3/form_field_new.3				minix-sys
 ./usr/man/man3/form_field_opts.3			minix-sys
-./usr/man/man3/form_field_userptr.3			minix-sys
-./usr/man/man3/form_field_validation.3			minix-sys
 ./usr/man/man3/form_fields.3				minix-sys
 ./usr/man/man3/form_fieldtype.3				minix-sys
+./usr/man/man3/form_field_userptr.3			minix-sys
+./usr/man/man3/form_field_validation.3			minix-sys
 ./usr/man/man3/form_hook.3				minix-sys
 ./usr/man/man3/form_init.3				minix-sys
 ./usr/man/man3/form_max_page.3				minix-sys
@@ -3172,11 +3172,11 @@
 ./usr/man/man3/form_opts_on.3				minix-sys
 ./usr/man/man3/form_page.3				minix-sys
 ./usr/man/man3/form_post.3				minix-sys
+./usr/man/man3/forms.3					minix-sys
 ./usr/man/man3/form_sub.3				minix-sys
 ./usr/man/man3/form_term.3				minix-sys
 ./usr/man/man3/form_userptr.3				minix-sys
 ./usr/man/man3/form_win.3				minix-sys
-./usr/man/man3/forms.3					minix-sys
 ./usr/man/man3/fparseln.3				minix-sys
 ./usr/man/man3/fpclassify.3				minix-sys
 ./usr/man/man3/fpgetmask.3				minix-sys
@@ -3197,13 +3197,13 @@
 ./usr/man/man3/fputws.3					minix-sys
 ./usr/man/man3/fread.3					minix-sys
 ./usr/man/man3/free.3					minix-sys
+./usr/man/man3/freeaddrinfo.3				minix-sys
 ./usr/man/man3/free_field.3				minix-sys
 ./usr/man/man3/free_fieldtype.3				minix-sys
 ./usr/man/man3/free_form.3				minix-sys
+./usr/man/man3/freeifaddrs.3				minix-sys
 ./usr/man/man3/free_item.3				minix-sys
 ./usr/man/man3/free_menu.3				minix-sys
-./usr/man/man3/freeaddrinfo.3				minix-sys
-./usr/man/man3/freeifaddrs.3				minix-sys
 ./usr/man/man3/freopen.3				minix-sys
 ./usr/man/man3/frexp.3					minix-sys
 ./usr/man/man3/fropen2.3				minix-sys
@@ -3559,9 +3559,9 @@
 ./usr/man/man3/libarchive_internals.3			minix-sys
 ./usr/man/man3/libmagic.3				minix-sys
 ./usr/man/man3/link_addr.3				minix-sys
+./usr/man/man3/linkaddr.3				minix-sys
 ./usr/man/man3/link_field.3				minix-sys
 ./usr/man/man3/link_fieldtype.3				minix-sys
-./usr/man/man3/linkaddr.3				minix-sys
 ./usr/man/man3/link_ntoa.3				minix-sys
 ./usr/man/man3/linkntoa.3				minix-sys
 ./usr/man/man3/llabs.3					minix-sys
@@ -3678,10 +3678,10 @@
 ./usr/man/man3/menu_item_name.3				minix-sys
 ./usr/man/man3/menu_item_new.3				minix-sys
 ./usr/man/man3/menu_item_opts.3				minix-sys
+./usr/man/man3/menu_items.3				minix-sys
 ./usr/man/man3/menu_item_userptr.3			minix-sys
 ./usr/man/man3/menu_item_value.3			minix-sys
 ./usr/man/man3/menu_item_visible.3			minix-sys
-./usr/man/man3/menu_items.3				minix-sys
 ./usr/man/man3/menu_mark.3				minix-sys
 ./usr/man/man3/menu_new.3				minix-sys
 ./usr/man/man3/menu_opts.3				minix-sys
@@ -3690,12 +3690,12 @@
 ./usr/man/man3/menu_pad.3				minix-sys
 ./usr/man/man3/menu_pattern.3				minix-sys
 ./usr/man/man3/menu_post.3				minix-sys
+./usr/man/man3/menus.3					minix-sys
 ./usr/man/man3/menu_sub.3				minix-sys
 ./usr/man/man3/menu_term.3				minix-sys
 ./usr/man/man3/menu_unmark.3				minix-sys
 ./usr/man/man3/menu_userptr.3				minix-sys
 ./usr/man/man3/menu_win.3				minix-sys
-./usr/man/man3/menus.3					minix-sys
 ./usr/man/man3/mergesort.3				minix-sys
 ./usr/man/man3/meta.3					minix-sys
 ./usr/man/man3/mi_vector_hash.3				minix-sys
@@ -3762,8 +3762,8 @@
 ./usr/man/man3/new_form.3				minix-sys
 ./usr/man/man3/new_item.3				minix-sys
 ./usr/man/man3/new_menu.3				minix-sys
-./usr/man/man3/new_page.3				minix-sys
 ./usr/man/man3/newpad.3					minix-sys
+./usr/man/man3/new_page.3				minix-sys
 ./usr/man/man3/newterm.3				minix-sys
 ./usr/man/man3/newwin.3					minix-sys
 ./usr/man/man3/nextafter.3				minix-sys
@@ -3814,7 +3814,6 @@
 ./usr/man/man3/popcountll.3				minix-sys
 ./usr/man/man3/popen.3					minix-sys
 ./usr/man/man3/pos_form_cursor.3			minix-sys
-./usr/man/man3/pos_menu_cursor.3			minix-sys
 ./usr/man/man3/posix2time.3				minix-sys
 ./usr/man/man3/posix2time_z.3				minix-sys
 ./usr/man/man3/posix_memalign.3				minix-sys
@@ -3840,6 +3839,7 @@
 ./usr/man/man3/posix_spawn_file_actions_destroy.3	minix-sys
 ./usr/man/man3/posix_spawn_file_actions_init.3		minix-sys
 ./usr/man/man3/posix_spawnp.3				minix-sys
+./usr/man/man3/pos_menu_cursor.3			minix-sys
 ./usr/man/man3/post_form.3				minix-sys
 ./usr/man/man3/post_menu.3				minix-sys
 ./usr/man/man3/pow.3					minix-sys
@@ -4147,8 +4147,15 @@
 ./usr/man/man3/secure_path.3				minix-sys
 ./usr/man/man3/seed48.3					minix-sys
 ./usr/man/man3/seekdir.3				minix-sys
+./usr/man/man3/setbuf.3					minix-sys
+./usr/man/man3/setbuffer.3				minix-sys
+./usr/man/man3/setclasscontext.3			minix-sys
 ./usr/man/man3/set_current_field.3			minix-sys
 ./usr/man/man3/set_current_item.3			minix-sys
+./usr/man/man3/set_curterm.3				minix-sys
+./usr/man/man3/setdisktab.3				minix-sys
+./usr/man/man3/setdomainname.3				minix-sys
+./usr/man/man3/setenv.3					minix-sys
 ./usr/man/man3/set_field_back.3				minix-sys
 ./usr/man/man3/set_field_buffer.3			minix-sys
 ./usr/man/man3/set_field_fore.3				minix-sys
@@ -4160,9 +4167,9 @@
 ./usr/man/man3/set_field_status.3			minix-sys
 ./usr/man/man3/set_field_term.3				minix-sys
 ./usr/man/man3/set_field_type.3				minix-sys
-./usr/man/man3/set_field_userptr.3			minix-sys
 ./usr/man/man3/set_fieldtype_arg.3			minix-sys
 ./usr/man/man3/set_fieldtype_choice.3			minix-sys
+./usr/man/man3/set_field_userptr.3			minix-sys
 ./usr/man/man3/set_form_fields.3			minix-sys
 ./usr/man/man3/set_form_init.3				minix-sys
 ./usr/man/man3/set_form_opts.3				minix-sys
@@ -4171,10 +4178,23 @@
 ./usr/man/man3/set_form_term.3				minix-sys
 ./usr/man/man3/set_form_userptr.3			minix-sys
 ./usr/man/man3/set_form_win.3				minix-sys
+./usr/man/man3/setfsent.3				minix-sys
+./usr/man/man3/setgrent.3				minix-sys
+./usr/man/man3/setgroupent.3				minix-sys
+./usr/man/man3/sethostent.3				minix-sys
+./usr/man/man3/sethostid.3				minix-sys
+./usr/man/man3/sethostname.3				minix-sys
 ./usr/man/man3/set_item_init.3				minix-sys
 ./usr/man/man3/set_item_term.3				minix-sys
 ./usr/man/man3/set_item_userptr.3			minix-sys
 ./usr/man/man3/set_item_value.3				minix-sys
+./usr/man/man3/_setjmp.3				minix-sys
+./usr/man/man3/setjmp.3					minix-sys
+./usr/man/man3/setkey.3					minix-sys
+./usr/man/man3/setlinebuf.3				minix-sys
+./usr/man/man3/setlocale.3				minix-sys
+./usr/man/man3/setlogmask.3				minix-sys
+./usr/man/man3/setlogmask_r.3				minix-sys
 ./usr/man/man3/set_max_field.3				minix-sys
 ./usr/man/man3/set_menu_back.3				minix-sys
 ./usr/man/man3/set_menu_fore.3				minix-sys
@@ -4190,31 +4210,10 @@
 ./usr/man/man3/set_menu_unmark.3			minix-sys
 ./usr/man/man3/set_menu_userptr.3			minix-sys
 ./usr/man/man3/set_menu_win.3				minix-sys
-./usr/man/man3/set_new_page.3				minix-sys
-./usr/man/man3/set_top_row.3				minix-sys
-./usr/man/man3/setbuf.3					minix-sys
-./usr/man/man3/setbuffer.3					minix-sys
-./usr/man/man3/setclasscontext.3					minix-sys
-./usr/man/man3/set_curterm.3					minix-sys
-./usr/man/man3/setdisktab.3					minix-sys
-./usr/man/man3/setdomainname.3					minix-sys
-./usr/man/man3/setenv.3					minix-sys
-./usr/man/man3/setfsent.3					minix-sys
-./usr/man/man3/setgrent.3					minix-sys
-./usr/man/man3/setgroupent.3					minix-sys
-./usr/man/man3/sethostent.3					minix-sys
-./usr/man/man3/sethostid.3					minix-sys
-./usr/man/man3/sethostname.3					minix-sys
-./usr/man/man3/_setjmp.3					minix-sys
-./usr/man/man3/setjmp.3					minix-sys
-./usr/man/man3/setkey.3					minix-sys
-./usr/man/man3/setlinebuf.3					minix-sys
-./usr/man/man3/setlocale.3					minix-sys
-./usr/man/man3/setlogmask.3					minix-sys
-./usr/man/man3/setlogmask_r.3					minix-sys
 ./usr/man/man3/setmode.3				minix-sys
 ./usr/man/man3/setnetent.3				minix-sys
 ./usr/man/man3/setnetgrent.3				minix-sys
+./usr/man/man3/set_new_page.3				minix-sys
 ./usr/man/man3/setpassent.3				minix-sys
 ./usr/man/man3/setproctitle.3				minix-sys
 ./usr/man/man3/setprogname.3				minix-sys
@@ -4227,6 +4226,7 @@
 ./usr/man/man3/setstate.3				minix-sys
 ./usr/man/man3/set_term.3				minix-sys
 ./usr/man/man3/setterm.3				minix-sys
+./usr/man/man3/set_top_row.3				minix-sys
 ./usr/man/man3/setttyent.3				minix-sys
 ./usr/man/man3/setttyentpath.3				minix-sys
 ./usr/man/man3/setupterm.3				minix-sys
@@ -4950,7 +4950,7 @@
 ./usr/share/doc/kyua-testers/NEWS	minix-sys	kyua
 ./usr/share/doc/kyua-testers/README	minix-sys	kyua
 ./usr/share/doc/psd			minix-sys
-./usr/share/doc/psd/19.curses		inix-sys
+./usr/share/doc/psd/19.curses		minix-sys
 ./usr/share/doc/psd/19.curses/appen.A	minix-sys
 ./usr/share/doc/psd/19.curses/appen.B	minix-sys
 ./usr/share/doc/psd/19.curses/appen.C	minix-sys
@@ -5423,7 +5423,7 @@
 ./usr/share/zoneinfo/Asia/Yakutsk	minix-sys
 ./usr/share/zoneinfo/Asia/Yekaterinburg	minix-sys
 ./usr/share/zoneinfo/Asia/Yerevan	minix-sys
-./usr/share/zoneinfo/Atlantic		inix-sys
+./usr/share/zoneinfo/Atlantic		minix-sys
 ./usr/share/zoneinfo/Atlantic/Azores	minix-sys
 ./usr/share/zoneinfo/Atlantic/Bermuda	minix-sys
 ./usr/share/zoneinfo/Atlantic/Canary	minix-sys
@@ -5704,7 +5704,6 @@
 ./usr/spool/crontabs			minix-sys
 ./usr/spool/locks			minix-sys
 ./usr/spool/lpd				minix-sys
-./usr/spool/mail			minix-sys
 ./usr/src				minix-sys
 ./usr/tests				minix-sys
 ./usr/tests/atf/atf-c++/detail/auto_array_test	minix-sys	atf
@@ -5877,5 +5876,6 @@
 ./var/db/obsolete/minix			minix-sys
 ./var/db/obsolete/tests			minix-sys	atf
 ./var/log				minix-sys
+./var/mail				minix-sys
 ./var/run				minix-sys
 ./var/tmp				minix-sys

etc/mtree/NetBSD.dist.base

@@ -135,7 +135,6 @@
 ./usr/spool/crontabs
 ./usr/spool/locks
 ./usr/spool/lpd
-./usr/spool/mail
 ./usr/src
 ./usr/tests
 ./usr/var
@@ -145,6 +144,7 @@
 ./var
 ./var/db
 ./var/db/obsolete
+./var/mail
 ./var/run
 
 # Directories with special access rights

include/paths.h

@@ -77,7 +77,7 @@
 #define	_PATH_KSYMS	"/dev/ksyms"
 #define	_PATH_KVMDB	"/var/db/kvm.db"
 #define	_PATH_LOCALE	"/usr/share/locale"
-#define	_PATH_MAILDIR	"/usr/spool/mail"
+#define	_PATH_MAILDIR	"/var/mail"
 #define	_PATH_MAN	"/usr/share/man"
 #define	_PATH_MEM	"/dev/mem"
 #define	_PATH_MIXER	"/dev/mixer"

man/man1/mail.1

@@ -31,7 +31,7 @@ mail \- send and receive electronic mail
 # Reverse print order, i.e., print oldest first
 .TP 5
 .B \-f
-# Use \fIfile\fR instead of \fI/usr/spool/mail/user\fR as mailbox
+# Use \fIfile\fR instead of \fI/var/mail/user\fR as mailbox
 .PP
 .TP 5
 .B \-d
@@ -56,7 +56,7 @@ mail \- send and receive electronic mail
 .B cat mail.cdiff | mail -s ''Here's the diff!'' asw
 # Pipe program output to mail with a subject line
 .TP 20
-.B mail -f /usr/spool/mail/asw
+.B mail -f /var/mail/asw
 # How root can read asw's mail
 .SH DESCRIPTION
 .PP
@@ -71,7 +71,7 @@ No such agent is supplied with
 \s-1MINIX 3\s-1.
 .PP
 When called by \fIuser\fR with no arguments, it examines the mailbox
-\fI/usr/spool/mail/user\fR, prints one message (depending on the \fB\-r\fR
+\fI/var/mail/user\fR, prints one message (depending on the \fB\-r\fR
 flag), and waits for one of the following commands:
 .PP
 .nf
@@ -90,10 +90,10 @@ flag), and waits for one of the following commands:
 To send mail, the program is called with the name of one or more recipients as
 arguments.  The mail is sent, along with a postmark line containing the date.
 For local delivery, a file named after each recipient in the directory
-\fI/usr/spool/mail\fR must be writable. If a spool file does not exist for
+\fI/var/mail\fR must be writable. If a spool file does not exist for
 a recipient it will be created.
 .PP
-If the directory \fI/usr/spool/mail\fR does not exist then the mail is
+If the directory \fI/var/mail\fR does not exist then the mail is
 dumped on the console, so that system programs have a way to notify
 a user on a system that does not have a mail spool.
 .PP