From a75f4e2a02e287294b21ae9e5b1f28b2f8faea39 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 11 Jan 2015 23:40:46 -0500
Subject: fstab-util: fix priority parsing and add test

---
 src/shared/fstab-util.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/shared/fstab-util.c')

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index a886f6a5da..cf317e17bd 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -133,8 +133,10 @@ int fstab_find_pri(const char *options, int *ret) {
         assert(ret);
 
         r = fstab_filter_options(options, "pri\0", NULL, &opt, NULL);
-        if (r <= 0)
+        if (r < 0)
                 return r;
+        if (r == 0 || !opt)
+                return 0;
 
         r = safe_atou(opt, &pri);
         if (r < 0)
@@ -143,6 +145,6 @@ int fstab_find_pri(const char *options, int *ret) {
         if ((int) pri < 0)
                 return -ERANGE;
 
-        *ret = (int) r;
+        *ret = (int) pri;
         return 1;
 }
-- 
cgit v1.2.3-54-g00ecf