chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysv-generator: Re-fix .sh suffix handling
[elogind.git]
/
src
/
sysv-generator
/
sysv-generator.c
diff --git
a/src/sysv-generator/sysv-generator.c
b/src/sysv-generator/sysv-generator.c
index 09ade0dc3a308c4557f484e03a8cb7f2087f30d7..662d08cccb2542b455dfe7902395cfd28eaad78d 100644
(file)
--- a/
src/sysv-generator/sysv-generator.c
+++ b/
src/sysv-generator/sysv-generator.c
@@
-299,11
+299,9
@@
static int sysv_translate_facility(const char *name, const char *filename, char
/* strip ".sh" suffix from file name for comparison */
filename_no_sh = strdupa(filename);
/* strip ".sh" suffix from file name for comparison */
filename_no_sh = strdupa(filename);
- e = endswith(filename, ".sh");
- if (e)
{
+ e = endswith(filename
_no_sh
, ".sh");
+ if (e)
*e = '\0';
*e = '\0';
- filename = filename_no_sh;
- }
/* If we don't know this name, fallback heuristics to figure
* out whether something is a target or a service alias. */
/* If we don't know this name, fallback heuristics to figure
* out whether something is a target or a service alias. */
@@
-314,7
+312,7
@@
static int sysv_translate_facility(const char *name, const char *filename, char
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
- } else if (filename && streq(name, filename))
+ } else if (filename && streq(name, filename
_no_sh
))
/* Names equaling the file name of the services are redundant */
return 0;
else
/* Names equaling the file name of the services are redundant */
return 0;
else