xscreensaver-04-solaris-paths.diff revision 18790
10139N/A * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 16880N/A * Permission is hereby granted, free of charge, to any person obtaining a 10139N/A * copy of this software and associated documentation files (the "Software"), 10139N/A * to deal in the Software without restriction, including without limitation 10139N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense, 17185N/A * and/or sell copies of the Software, and to permit persons to whom the 10139N/A * Software is furnished to do so, subject to the following conditions: 17178N/A * The above copyright notice and this permission notice (including the next 17178N/A * paragraph) shall be included in all copies or substantial portions of the 10139N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 17089N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12578N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 10139N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 10139N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 10139N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 10139N/A@@ -955,7 +955,7 @@ restart_menu_cb (GtkWidget *widget, gpoi 10139N/A flush_dialog_changes_and_save (s); 10139N/A xscreensaver_command (GDK_DISPLAY(), XA_EXIT, 0, False, NULL); 15591N/A@@ -4894,7 +4894,7 @@ main (int argc, char **argv) 16880N/A@@ -791,6 +792,8 @@ print_path_error (const char *program) 16880N/A+/* mali - security issue do not want to display user's path */ 10139N/A@@ -821,6 +824,7 @@ print_path_error (const char *program) 11155N/A@@ -877,12 +881,42 @@ fork_and_exec (saver_screen_info *ssi, c 10139N/A+check_if_hacks_dir_exists(Bool verbose_p) 10139N/A+ const char hackdir[] = HACK_PATH; 17059N/A+ if (status == 0 && S_ISDIR(st.st_mode)) 10139N/A spawn_screenhack (saver_screen_info *ssi) 16880N/A saver_preferences *p = &si->prefs; 16880N/A if (!monitor_powered_on_p (si)) 16880N/A@@ -962,6 +996,12 @@ spawn_screenhack (saver_screen_info *ssi 16880N/A+ (check_if_hacks_dir_exists(p->verbose_p) == False)) 16880N/A if (new_hack < 0) /* don't run a hack */ 16880N/A@@ -1009,7 +1049,17 @@ spawn_screenhack (saver_screen_info *ssi 16880N/A- forked = fork_and_exec (ssi, hack->command); 16880N/A+ /* We need complete path to hack command else any executable 16880N/A+ * with the same name in the path gets executed. 16880N/A+ complete_hack_command = malloc (10 + strlen(hack->command) + 16880N/A+ sprintf(complete_hack_command, HACK_PATH"/%s
", hack->command); 10139N/A+ forked = fork_and_exec (ssi, complete_hack_command); 17200N/A@@ -1184,7 +1234,7 @@ get_best_gl_visual (saver_info *si, Scre 16880N/A@@ -872,8 +872,10 @@ Installed</property> 16880N/A <property name="label" translatable="yes">Very few (or no) screen savers appear to be available. 16623N/A-This probably means that the "xscreensaver-extras" and 16511N/A-"xscreensaver-gl-extras" packages are not installed.</property> 16013N/A@@ -695,12 +695,15 @@ sub reformat_rss($) { 16038N/A my ($title, $body1, $body2, $body3); 15968N/A $title = $3 if (m@<((TITLE) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi); 15792N/A $body1 = $3 if (m@<((DESCRIPTION) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi); 15792N/A $body2 = $3 if (m@<((CONTENT) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi); 15591N/A $body3 = $3 if (m@<((SUMMARY) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi); 15591N/A+ $author = $3 if (m@<((DC:CREATOR) [^<>\s]*)[^<>]*>\s*(.*?)\s*</\1>@xsi); 15543N/A # If there are both <description> and <content> or <content:encoded>, 15543N/A # use whichever one contains more text. 15503N/A@@ -724,10 +727,11 @@ sub reformat_rss($) { 15460N/A $title = rss_field_to_html ($title || ''); 15460N/A $body1 = rss_field_to_html ($body1 || ''); 15389N/A+ $author = rss_field_to_html ($author || ''); 15389N/A $title = '' if ($body1 eq $title); # Identical in Twitter's atom feed. 14468N/A@@ -97,9 +97,8 @@ xscreensaver-command -restart 14468N/A If you want to set the system-wide defaults, then make your edits to 14362N/A the xscreensaver app-defaults file, which should have been installed 14362N/A when xscreensaver itself was installed. The app-defaults file will 14133N/A-systems might keep it in a different place (for example, 14014N/A+systems might keep it in a different place. 14014N/A When settings are changed in the Preferences dialog box (see above) 14014N/A the current settings will be written to the \fI.xscreensaver\fP file. 14014N/A@@ -270,7 +270,7 @@ install-program:: $(EXES) 14014N/A # the xscreensaver-gl-helper program, in $bindir 13786N/A@@ -339,7 +339,7 @@ uninstall-program:: 13786N/A # the xscreensaver-gl-helper program, in $bindir 13318N/A echo rm -f $$idir/$$program ; \