[systemd-commits] Makefile.am src/cgls.c src/systemd-cgls.c
Lennart Poettering
lennart at kemper.freedesktop.org
Wed Jul 14 06:09:36 PDT 2010
Makefile.am | 2
src/cgls.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/systemd-cgls.c | 122 -----------------------------------------------------
3 files changed, 123 insertions(+), 123 deletions(-)
New commits:
commit d04247cf25057cb5b3359244cd145e4027bd8536
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jul 14 15:09:27 2010 +0200
cgls: rename source file to cgls.c, since we have no prefix for any of the other files either
diff --git a/Makefile.am b/Makefile.am
index ff8e847..9d52772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -515,7 +515,7 @@ systemd_install_CFLAGS = \
$(DBUS_CFLAGS)
systemd_cgls_SOURCES = \
- src/systemd-cgls.c \
+ src/cgls.c \
src/cgroup-show.c \
src/cgroup-util.c
diff --git a/src/cgls.c b/src/cgls.c
new file mode 100644
index 0000000..cd03e91
--- /dev/null
+++ b/src/cgls.c
@@ -0,0 +1,122 @@
+/*-*- Mode: C; c-basic-offset: 8 -*-*/
+
+/***
+ 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/>.
+***/
+
+#include <limits.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <getopt.h>
+#include <string.h>
+
+#include "cgroup-show.h"
+#include "cgroup-util.h"
+#include "log.h"
+#include "util.h"
+
+static void help(void) {
+
+ printf("%s [OPTIONS...] [CGROUP...]\n\n"
+ "Recursively show control group contents.\n\n"
+ " -h --help Show this help\n",
+ program_invocation_short_name);
+}
+
+static int parse_argv(int argc, char *argv[]) {
+
+ static const struct option options[] = {
+ { "help", no_argument, NULL, 'h' },
+ { NULL, 0, NULL, 0 }
+ };
+
+ int c;
+
+ assert(argc >= 1);
+ assert(argv);
+
+ while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+
+ switch (c) {
+
+ case 'h':
+ help();
+ return 0;
+
+ case '?':
+ return -EINVAL;
+
+ default:
+ log_error("Unknown option code %c", c);
+ return -EINVAL;
+ }
+ }
+
+ return 1;
+}
+
+int main(int argc, char *argv[]) {
+ int r = 0, retval = 1;
+
+ log_parse_environment();
+
+ if ((r = parse_argv(argc, argv)) < 0)
+ goto finish;
+ else if (r == 0) {
+ retval = 0;
+ goto finish;
+ }
+
+ if (optind < argc) {
+ unsigned i;
+
+ for (i = (unsigned) optind; i < (unsigned) argc; i++) {
+ int q;
+ printf("%s:\n", argv[i]);
+
+ if ((q = show_cgroup_by_path(argv[i], NULL, 0)) < 0)
+ r = q;
+ }
+
+ } else {
+ char *p;
+
+ if (!(p = get_current_dir_name())) {
+ log_error("Cannot determine current working directory: %m");
+ goto finish;
+ }
+
+ if (path_startswith(p, "/cgroup")) {
+ printf("Working Directory %s:\n", p);
+ r = show_cgroup_by_path(p, NULL, 0);
+ } else
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, "/", NULL, 0);
+
+ free(p);
+ }
+
+ if (r < 0)
+ log_error("Failed to list cgroup tree: %s", strerror(-r));
+
+ retval = 0;
+
+finish:
+
+ return retval;
+}
diff --git a/src/systemd-cgls.c b/src/systemd-cgls.c
deleted file mode 100644
index cd03e91..0000000
--- a/src/systemd-cgls.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
-
-/***
- 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/>.
-***/
-
-#include <limits.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <getopt.h>
-#include <string.h>
-
-#include "cgroup-show.h"
-#include "cgroup-util.h"
-#include "log.h"
-#include "util.h"
-
-static void help(void) {
-
- printf("%s [OPTIONS...] [CGROUP...]\n\n"
- "Recursively show control group contents.\n\n"
- " -h --help Show this help\n",
- program_invocation_short_name);
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
- static const struct option options[] = {
- { "help", no_argument, NULL, 'h' },
- { NULL, 0, NULL, 0 }
- };
-
- int c;
-
- assert(argc >= 1);
- assert(argv);
-
- while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
-
- switch (c) {
-
- case 'h':
- help();
- return 0;
-
- case '?':
- return -EINVAL;
-
- default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
- }
- }
-
- return 1;
-}
-
-int main(int argc, char *argv[]) {
- int r = 0, retval = 1;
-
- log_parse_environment();
-
- if ((r = parse_argv(argc, argv)) < 0)
- goto finish;
- else if (r == 0) {
- retval = 0;
- goto finish;
- }
-
- if (optind < argc) {
- unsigned i;
-
- for (i = (unsigned) optind; i < (unsigned) argc; i++) {
- int q;
- printf("%s:\n", argv[i]);
-
- if ((q = show_cgroup_by_path(argv[i], NULL, 0)) < 0)
- r = q;
- }
-
- } else {
- char *p;
-
- if (!(p = get_current_dir_name())) {
- log_error("Cannot determine current working directory: %m");
- goto finish;
- }
-
- if (path_startswith(p, "/cgroup")) {
- printf("Working Directory %s:\n", p);
- r = show_cgroup_by_path(p, NULL, 0);
- } else
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, "/", NULL, 0);
-
- free(p);
- }
-
- if (r < 0)
- log_error("Failed to list cgroup tree: %s", strerror(-r));
-
- retval = 0;
-
-finish:
-
- return retval;
-}
More information about the systemd-commits
mailing list