Commit aa1caef5 aa1caef5a181287fcd68a4ec9a600e4927a40833 by Sergey Poznyakoff

Minor improvement

* examples/config/dot.biffrc: Update.
* comsat/comsat.c (main): In test mode, normalize biffrc names that
begin with ./ or ../
1 parent 55086f94
...@@ -606,7 +606,8 @@ main (int argc, char **argv) ...@@ -606,7 +606,8 @@ main (int argc, char **argv)
606 } 606 }
607 } 607 }
608 608
609 if (biffrc[0] == '.' && biffrc[1] == '/') 609 if (biffrc[0] == '.' && (biffrc[1] == '/' ||
610 (biffrc[1] == '.' && biffrc[2] == '/')))
610 { 611 {
611 char *cwd = mu_getcwd (); 612 char *cwd = mu_getcwd ();
612 biffrc = mu_make_file_name (cwd, biffrc); 613 biffrc = mu_make_file_name (cwd, biffrc);
......
...@@ -3,11 +3,28 @@ ...@@ -3,11 +3,28 @@
3 # the user and have permissions 0600 3 # the user and have permissions 0600
4 # Each line specifies an action to be taken upon arrival of 4 # Each line specifies an action to be taken upon arrival of
5 # a message. A backslash can be used to escape the newlines. 5 # a message. A backslash can be used to escape the newlines.
6 # Actions could be:
7 # beep -- Produce audible signal
8 # echo STRING -- Output STRING to the user's tty
9 # exec PROG ARGS... -- Execute given program
10 # 6 #
7 # Valid actions are:
8 # * beep
9 # Produces audible signal.
10 # * echo [-n] ARGS
11 # Outputs ARGS to the tty. The -n option suppresses trailing newline.
12 # * exec PROG ARGS...
13 # Executes the program PROG with the given arguments.
14 # * default
15 # Executes the default (built-in) actions.
16 # * tty NAME [[~]FLT [ARGS] [+ [~]FLT [ARGS]...]
17 # Opens the file NAME and assigns it as a tty for subsequent commands.
18 # NAME can be any type of file, the only requirement being that it
19 # must exist. Optional arguments insert a chain of filters before
20 # writing to that file or device. For the list of available filters
21 # run `mu filter --list'. Filters are applied from right to left.
22 # The ~ in front of a filter name means open this filter in decode more
23 # (by default, filters are opened in encode mode).
24 # Default settings correspond to:
25 # tty /dev/tty 7bit + ?crlf
26 # The ? means apply next filter only if the device needs CR to be output
27 # before each LF.
11 28
12 # This is the default action 29 # This is the default action
13 echo "Mail to \a$u@$h\a\n---\n\ 30 echo "Mail to \a$u@$h\a\n---\n\
...@@ -15,7 +32,7 @@ From: $H{from}\n\ ...@@ -15,7 +32,7 @@ From: $H{from}\n\
15 Subject: $H{Subject}\n\ 32 Subject: $H{Subject}\n\
16 ---\n\ 33 ---\n\
17 $B(,5)\n\ 34 $B(,5)\n\
18 ---\n" 35 ---"
19 36
20 # For users of X windows system: produce a bell and open an xmessage window 37 # For users of X windows system: produce a bell and open an xmessage window
21 beep 38 beep
......