Attachment 582752 Details for Bug 814690 – fix up missing new lines

[patch] fix up missing new lines

add-newlines.patch (text/plain), 3.92 KB, created by Ray Strode [halfline] on 2012-05-07 18:09:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2012-05-07 18:09:25 UTC

Size: 3.92 KB

patch

obsolete

>From e79d88f63aec75599523f7f628807f0147a46d37 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 7 May 2012 12:24:01 -0400
>Subject: [PATCH 1/2] list: allow LIST_FOREACH to have "else" when no items
>
>---
> src/shared/list.h |   14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/src/shared/list.h b/src/shared/list.h
>index 9a491b9..05db71d 100644
>--- a/src/list.h
>+++ b/src/list.h
>@@ -114,15 +114,21 @@
>         (!(item)->name##_prev && !(item)->name##_next)                  \
> 
> #define LIST_FOREACH(name,i,head)                                       \
>-        for ((i) = (head); (i); (i) = (i)->name##_next)
>+        if ((i))                                                        \
>+                for ((i) = (head); (i); (i) = (i)->name##_next)
> 
> #define LIST_FOREACH_SAFE(name,i,n,head)                                \
>-        for ((i) = (head); (i) && (((n) = (i)->name##_next), 1); (i) = (n))
>+        if ((i))                                                        \
>+                for ((i) = (head);                                      \
>+                     (i) && (((n) = (i)->name##_next), 1);              \
>+                     (i) = (n))
> 
> #define LIST_FOREACH_BEFORE(name,i,p)                                   \
>-        for ((i) = (p)->name##_prev; (i); (i) = (i)->name##_prev)
>+        if ((i))                                                        \
>+                for ((i) = (p)->name##_prev; (i); (i) = (i)->name##_prev)
> 
> #define LIST_FOREACH_AFTER(name,i,p)                                    \
>-        for ((i) = (p)->name##_next; (i); (i) = (i)->name##_next)
>+        if ((i))                                                        \
>+                for ((i) = (p)->name##_next; (i); (i) = (i)->name##_next)
> 
> #endif
>-- 
>1.7.10
>
>
>From b5f66697ef36f73ad2193abd2d9bff56fcca9c13 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 7 May 2012 12:26:07 -0400
>Subject: [PATCH 2/2] logind: make sure to terminate user state file lines
>
>They were only getting newlines if had any values in
>them.
>---
> src/login/logind-user.c |   11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/src/login/logind-user.c b/src/login/logind-user.c
>index 27f78ad..f83742a 100644
>--- a/src/login/logind-user.c
>+++ b/src/login/logind-user.c
>@@ -144,6 +144,8 @@ int user_save(User *u) {
>                                 "%s%c",
>                                 i->id,
>                                 i->sessions_by_user_next ? ' ' : '\n');
>+                } else {
>+                        fputc('\n', f);
>                 }
> 
>                 fputs("SEATS=", f);
>@@ -153,15 +155,20 @@ int user_save(User *u) {
>                                         "%s%c",
>                                         i->seat->id,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                } else {
>+                        fputc('\n', f);
>                 }
> 
>                 fputs("ACTIVE_SESSIONS=", f);
>-                LIST_FOREACH(sessions_by_user, i, u->sessions)
>+                LIST_FOREACH(sessions_by_user, i, u->sessions) {
>                         if (session_is_active(i))
>                                 fprintf(f,
>                                         "%lu%c",
>                                         (unsigned long) i->user->uid,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                } else {
>+                        fputc('\n', f);
>+                }
> 
>                 fputs("ACTIVE_SEATS=", f);
>                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
>@@ -170,6 +177,8 @@ int user_save(User *u) {
>                                         "%s%c",
>                                         i->seat->id,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                } else {
>+                        fputc('\n', f);
>                 }
>         }
> 
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 814690: 578989 | 581585 | 582752 | 582782