diff options
| author | Chong Yidong | 2012-02-25 17:07:23 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-02-25 17:07:23 +0800 |
| commit | fa74b241a324c5c44c4223c2d1b4c2fcb605eb72 (patch) | |
| tree | 64313858047c7834da491e0166cedc981ad8167c /src | |
| parent | a3fcfa99f65c578d857ce0f6e8595f6a5ad77ec8 (diff) | |
| download | emacs-fa74b241a324c5c44c4223c2d1b4c2fcb605eb72.tar.gz emacs-fa74b241a324c5c44c4223c2d1b4c2fcb605eb72.zip | |
Document SELinux support functions in Lisp manual.
* doc/lispref/backups.texi (Making Backups): Return value of backup-buffer is
changed.
* doc/lispref/files.texi (File Attributes): Document file-selinux-context.
(Changing Files): Link to it.
(Changing Files): Document set-file-selinux-context.
* fileio.c (Ffile_selinux_context, Fset_file_selinux_context):
Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fileio.c | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7b546244792..1566d6258af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-02-25 Chong Yidong <cyd@gnu.org> | 1 | 2012-02-25 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * fileio.c (Ffile_selinux_context, Fset_file_selinux_context): | ||
| 4 | Doc fix. | ||
| 5 | |||
| 3 | * xselect.c (Fx_selection_exists_p): Doc fix. | 6 | * xselect.c (Fx_selection_exists_p): Doc fix. |
| 4 | (x_clipboard_manager_save_all): Print an informative message | 7 | (x_clipboard_manager_save_all): Print an informative message |
| 5 | before saving to clipboard manager. | 8 | before saving to clipboard manager. |
diff --git a/src/fileio.c b/src/fileio.c index 839dc07b6ce..7efe919a9f0 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -2798,9 +2798,13 @@ See `file-symlink-p' to distinguish symlinks. */) | |||
| 2798 | 2798 | ||
| 2799 | DEFUN ("file-selinux-context", Ffile_selinux_context, | 2799 | DEFUN ("file-selinux-context", Ffile_selinux_context, |
| 2800 | Sfile_selinux_context, 1, 1, 0, | 2800 | Sfile_selinux_context, 1, 1, 0, |
| 2801 | doc: /* Return SELinux context of file named FILENAME, | 2801 | doc: /* Return SELinux context of file named FILENAME. |
| 2802 | as a list ("user", "role", "type", "range"). Return (nil, nil, nil, nil) | 2802 | The return value is a list (USER ROLE TYPE RANGE), where the list |
| 2803 | if file does not exist, is not accessible, or SELinux is disabled */) | 2803 | elements are strings naming the user, role, type, and range of the |
| 2804 | file's SELinux security context. | ||
| 2805 | |||
| 2806 | Return (nil nil nil nil) if the file is nonexistent or inaccessible, | ||
| 2807 | or if SELinux is disabled, or if Emacs lacks SELinux support. */) | ||
| 2804 | (Lisp_Object filename) | 2808 | (Lisp_Object filename) |
| 2805 | { | 2809 | { |
| 2806 | Lisp_Object absname; | 2810 | Lisp_Object absname; |
| @@ -2853,9 +2857,12 @@ if file does not exist, is not accessible, or SELinux is disabled */) | |||
| 2853 | 2857 | ||
| 2854 | DEFUN ("set-file-selinux-context", Fset_file_selinux_context, | 2858 | DEFUN ("set-file-selinux-context", Fset_file_selinux_context, |
| 2855 | Sset_file_selinux_context, 2, 2, 0, | 2859 | Sset_file_selinux_context, 2, 2, 0, |
| 2856 | doc: /* Set SELinux context of file named FILENAME to CONTEXT | 2860 | doc: /* Set SELinux context of file named FILENAME to CONTEXT. |
| 2857 | as a list ("user", "role", "type", "range"). Has no effect if SELinux | 2861 | CONTEXT should be a list (USER ROLE TYPE RANGE), where the list |
| 2858 | is disabled. */) | 2862 | elements are strings naming the components of a SELinux context. |
| 2863 | |||
| 2864 | This function does nothing if SELinux is disabled, or if Emacs was not | ||
| 2865 | compiled with SELinux support. */) | ||
| 2859 | (Lisp_Object filename, Lisp_Object context) | 2866 | (Lisp_Object filename, Lisp_Object context) |
| 2860 | { | 2867 | { |
| 2861 | Lisp_Object absname; | 2868 | Lisp_Object absname; |