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
=== modified file 'src/utils/mount.ecryptfs_private.c'
--- src/utils/mount.ecryptfs_private.c 2011-12-14 18:59:46 +0000
+++ src/utils/mount.ecryptfs_private.c 2012-05-21 19:56:17 +0000
@@ -523,22 +523,22 @@
523 alias = argv[1];523 alias = argv[1];
524 /* Read the source and destination dirs from .conf file */524 /* Read the source and destination dirs from .conf file */
525 if (read_config(pwd->pw_dir, uid, alias, &src, &dest, &opts2) < 0) {525 if (read_config(pwd->pw_dir, uid, alias, &src, &dest, &opts2) < 0) {
526 fputs("Error reading configuration file", stderr);526 fputs("Error reading configuration file\n", stderr);
527 exit(1);527 exit(1);
528 }528 }
529 if (opts2 != NULL && strlen(opts2) != 0 && strcmp(opts2, "none") != 0) {529 if (opts2 != NULL && strlen(opts2) != 0 && strcmp(opts2, "none") != 0) {
530 fputs("Mount options are not supported here", stderr);530 fputs("Mount options are not supported here\n", stderr);
531 exit(1);531 exit(1);
532 }532 }
533 } else {533 } else {
534 fputs("Too many arguments", stderr);534 fputs("Too many arguments\n", stderr);
535 exit(1);535 exit(1);
536 }536 }
537537
538 /* Lock the counter through the rest of the program */538 /* Lock the counter through the rest of the program */
539 fh_counter = lock_counter(pwd->pw_name, uid, alias);539 fh_counter = lock_counter(pwd->pw_name, uid, alias);
540 if (fh_counter == NULL) {540 if (fh_counter == NULL) {
541 fputs("Error locking counter", stderr);541 fputs("Error locking counter\n", stderr);
542 goto fail;542 goto fail;
543 }543 }
544544

Subscribers

People subscribed via source and target branches