Merge lp:~serge-hallyn/ecryptfs/ecryptfs-eol into lp:ecryptfs

Proposed by Serge Hallyn
Status: Merged
Merged at revision: 691
Proposed branch: lp:~serge-hallyn/ecryptfs/ecryptfs-eol
Merge into: lp:ecryptfs
Diff against target: 29 lines (+4/-4)
1 file modified
src/utils/mount.ecryptfs_private.c (+4/-4)
To merge this branch: bzr merge lp:~serge-hallyn/ecryptfs/ecryptfs-eol
Reviewer Review Type Date Requested Status
eCryptfs Pending
Review via email: mp+106696@code.launchpad.net

Description of the change

Please save me from ugly (sans newline) error messages when I type the wrong name to mount with mount.ecryptfs_private

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/utils/mount.ecryptfs_private.c'
2--- src/utils/mount.ecryptfs_private.c 2011-12-14 18:59:46 +0000
3+++ src/utils/mount.ecryptfs_private.c 2012-05-21 19:56:17 +0000
4@@ -523,22 +523,22 @@
5 alias = argv[1];
6 /* Read the source and destination dirs from .conf file */
7 if (read_config(pwd->pw_dir, uid, alias, &src, &dest, &opts2) < 0) {
8- fputs("Error reading configuration file", stderr);
9+ fputs("Error reading configuration file\n", stderr);
10 exit(1);
11 }
12 if (opts2 != NULL && strlen(opts2) != 0 && strcmp(opts2, "none") != 0) {
13- fputs("Mount options are not supported here", stderr);
14+ fputs("Mount options are not supported here\n", stderr);
15 exit(1);
16 }
17 } else {
18- fputs("Too many arguments", stderr);
19+ fputs("Too many arguments\n", stderr);
20 exit(1);
21 }
22
23 /* Lock the counter through the rest of the program */
24 fh_counter = lock_counter(pwd->pw_name, uid, alias);
25 if (fh_counter == NULL) {
26- fputs("Error locking counter", stderr);
27+ fputs("Error locking counter\n", stderr);
28 goto fail;
29 }
30

Subscribers

People subscribed via source and target branches