Imported Upstream version 1.8.0

[platform/upstream/augeas.git] / lenses / tmpfiles.aug

diff --git a/lenses/tmpfiles.aug b/lenses/tmpfiles.aug
index 7d82f7c..f426910 100644 (file)
--- a/lenses/tmpfiles.aug
+++ b/lenses/tmpfiles.aug
@@ -53,11 +53,11 @@ One letter. Some of them can have a "+" and all can have a "!".
 
 Not all letters are valid.
 *)
-  let type     = /([fFwdDvpLcbCxXrRzZtThHaAm]|[AabcLp]\+)!?/
+  let type     = /([fFwdDvqQpLcbCxXrRzZtThHaAm]|[AabcLp]\+)!?/
 
   (* View: mode
-"-", or 4 bytes. Optionally starts with a "~". *)
-  let mode     = /(-|~?[0-7]{4})/
+"-", or 3-4 bytes. Optionally starts with a "~". *)
+  let mode     = /(-|~?[0-7]{3,4})/
 
   (* View: age
 "-", or one of the formats seen in the manpage: 10d, 5seconds, 1y5days.
@@ -66,7 +66,7 @@ optionally starts with a "~'. *)
 
   (* View: argument
 The last field. It can contain spaces. *)
-  let argument = /([^# \t\n][^#\n]+)?[^# \t\n]/
+  let argument = /([^# \t\n][^#\n]*[^# \t\n]|[^# \t\n])/
 
   (* View: field
 Applies to the other fields: path, gid and uid fields *)