ac-power: make ac-power a proper binary that scripts can call

diff --git a/.gitignore b/.gitignore
index a99cd17480257e5c89dbe2e596f17a20e6c17541..21dd39456e7e5962b06d0d12e440c138e59b2523 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+systemd-ac-power

 systemd-timestamp
 systemd-cryptsetup
 systemd-cryptsetup-generator
 systemd-timestamp
 systemd-cryptsetup
 systemd-cryptsetup-generator

diff --git a/Makefile.am b/Makefile.am
index 52bd13fedb64e4dc526a9da1b16b407725e735c1..69faa5581a7dfbd478024d64ca0d953686e142b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,8 @@ rootlibexec_PROGRAMS = \
        systemd-quotacheck \
        systemd-cryptsetup \
        systemd-cryptsetup-generator \
        systemd-quotacheck \
        systemd-cryptsetup \
        systemd-cryptsetup-generator \

-       systemd-timestamp
+       systemd-timestamp \
+       systemd-ac-power

 
 noinst_PROGRAMS = \
        test-engine \
 
 noinst_PROGRAMS = \
        test-engine \


@@ -724,6 +725,17 @@ systemd_timestamp_CFLAGS = \
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 

+systemd_ac_power_SOURCES = \
+       src/ac-power.c
+
+systemd_ac_power_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_ac_power_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+

 systemd_cryptsetup_SOURCES = \
        src/cryptsetup.c
 
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup.c
 

diff --git a/src/ac-power.c b/src/ac-power.c
index a30216ffb3451582f52b4a858f5af0d7d7083844..24a68e717e4e345c1710b5b0483ce8bbc5f43146 100644 (file)
--- a/src/ac-power.c
+++ b/src/ac-power.c
@@ -26,9 +26,8 @@
 #include <libudev.h>
 
 #include "util.h"
 #include <libudev.h>
 
 #include "util.h"

-#include "ac-power.h"

 
 

-int on_ac_power(void) {
+static int on_ac_power(void) {

         int r;
 
         struct udev *udev;
         int r;
 
         struct udev *udev;


@@ -96,3 +95,17 @@ finish:
 
         return r;
 }
 
         return r;
 }

+
+int main(int argc, char *argv[]) {
+        int r;
+
+        /* This is mostly intended to be used for scripts which want
+         * to detect whether AC power is plugged in or not. */
+
+        if ((r = on_ac_power()) < 0) {
+                log_error("Failed to read AC status: %s", strerror(-r));
+                return EXIT_FAILURE;
+        }
+
+        return r == 0;
+}

diff --git a/src/ac-power.h b/src/ac-power.h
deleted file mode 100644 (file)
index 24f28b5..0000000
--- a/src/ac-power.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef fooacpowerhfoo
-#define fooacpowerhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-int on_ac_power(void);
-
-#endif