mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: use pa_path_get_filename() where applicable

Browse source
This commit is contained in:
Lennart Poettering 2009-06-04 23:19:48 +02:00
parent 8bada7496c
commit 4d874753f5
3 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/daemon/cmdline.c
View file

@ -31,6 +31,7 @@
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/i18n.h> #include <pulse/i18n.h>
#include <pulse/util.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulsecore/strbuf.h> #include <pulsecore/strbuf.h>
@ -109,15 +110,8 @@ static const struct option long_options[] = {
}; };
void pa_cmdline_help(const char *argv0) { void pa_cmdline_help(const char *argv0) {
const char *e;
pa_assert(argv0); pa_assert(argv0);
if ((e = strrchr(argv0, '/')))
e++;
else
e = argv0;
printf(_("%s [options]\n\n" printf(_("%s [options]\n\n"
"COMMANDS:\n" "COMMANDS:\n"
" -h, --help Show this help\n" " -h, --help Show this help\n"
@ -172,7 +166,8 @@ void pa_cmdline_help(const char *argv0) {
" -C Open a command line on the running TTY\n" " -C Open a command line on the running TTY\n"
" after startup\n\n" " after startup\n\n"
" -n Don't load default script file\n"), e); " -n Don't load default script file\n"),
pa_path_get_filename(argv0));
} }
int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d) { int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d) {

14
src/utils/pactl.c
View file

@ -802,7 +802,6 @@ enum {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
pa_mainloop* m = NULL; pa_mainloop* m = NULL;
char tmp[PATH_MAX];
int ret = 1, c; int ret = 1, c;
char *server = NULL, *bn; char *server = NULL, *bn;
@ -882,17 +881,8 @@ int main(int argc, char *argv[]) {
if (optind+2 < argc) if (optind+2 < argc)
sample_name = pa_xstrdup(argv[optind+2]); sample_name = pa_xstrdup(argv[optind+2]);
else { else {
char *f = strrchr(argv[optind+1], '/'); char *f = pa_path_get_filename(argv[optind+1]);
size_t n; sample_name = pa_xstrndup(f, strcspn(f, "."));
if (f)
f++;
else
f = argv[optind];
n = strcspn(f, ".");
strncpy(tmp, f, n);
tmp[n] = 0;
sample_name = pa_xstrdup(tmp);
} }
pa_zero(sfi); pa_zero(sfi);

5
src/utils/pasuspender.c
View file

@ -235,10 +235,7 @@ int main(int argc, char *argv[]) {
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR);
if (!(bn = strrchr(argv[0], '/'))) bn = pa_path_get_filename(argv[0]);
bn = argv[0];
else
bn++;
while ((c = getopt_long(argc, argv, "s:h", long_options, NULL)) != -1) { while ((c = getopt_long(argc, argv, "s:h", long_options, NULL)) != -1) {
switch (c) { switch (c) {