mirror of
git://slackware.nl/current.git
synced 2025-01-09 05:24:36 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
31 lines
826 B
Diff
31 lines
826 B
Diff
--- ./src/nm-hostname-manager.c.orig 2017-11-10 09:46:25.000000000 -0600
|
|
+++ ./src/nm-hostname-manager.c 2017-11-10 17:42:41.829996568 -0600
|
|
@@ -134,8 +134,7 @@
|
|
{
|
|
gs_free char *contents = NULL;
|
|
gs_strfreev char **all_lines = NULL;
|
|
- char *tmp;
|
|
- guint i, j = 0;
|
|
+ guint i = 0;
|
|
|
|
if (!g_file_get_contents (path, &contents, NULL, NULL))
|
|
return NULL;
|
|
@@ -145,17 +144,7 @@
|
|
g_strstrip (all_lines[i]);
|
|
if (all_lines[i][0] == '#' || all_lines[i][0] == '\0')
|
|
continue;
|
|
- tmp = &all_lines[i][0];
|
|
- /* We only want up to the first '.' -- the rest of the */
|
|
- /* fqdn is defined in /etc/hosts */
|
|
- while (tmp[j] != '\0') {
|
|
- if (tmp[j] == '.') {
|
|
- tmp[j] = '\0';
|
|
- break;
|
|
- }
|
|
- j++;
|
|
- }
|
|
- return g_shell_unquote (tmp, NULL);
|
|
+ return g_shell_unquote (&all_lines[i][0], NULL);
|
|
}
|
|
return NULL;
|
|
}
|