]> gitweb.ps.run Git - ps-cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 14:27:03 +0000 (14:27 +0000)
committerLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 14:27:03 +0000 (14:27 +0000)
1  2 
Makefile
html.c

diff --combined Makefile
index 538a9f8f9dcbb57e619682d6e46aed934f32cd26,3ddd7287b048b4410b4eaaad2020c35ae2a0a441..30f75757ed35e39fe5d843e8ea358b1acfb06ea7
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- CGIT_VERSION = v0.9.0.1
+ CGIT_VERSION = v0.9.0.2
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@@ -198,9 -198,9 +198,9 @@@ install-pdf: doc-pd
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
  
  uninstall:
 -      rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 -      rm -f $(CGIT_DATA_PATH)/cgit.css
 -      rm -f $(CGIT_DATA_PATH)/cgit.png
 +      rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 +      rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
 +      rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
  
  uninstall-doc: uninstall-man uninstall-html uninstall-pdf
  
diff --combined html.c
index eb1c25db9b84665c2a23e3ab0a74930ffd81d458,5b07aa0d9ee041b060e9bf99725b1bd3c47ce88b..8f6e4f6e0358fa7e6a4cc1bc3ae5e5cdfe8ddbae
--- 1/html.c
--- 2/html.c
+++ b/html.c
@@@ -162,7 -162,7 +162,7 @@@ void html_url_path(const char *txt
  {
        const char *t = txt;
        while(t && *t){
-               int c = *t;
+               unsigned char c = *t;
                const char *e = url_escape_table[c];
                if (e && c!='+' && c!='&') {
                        html_raw(txt, t - txt);
@@@ -179,7 -179,7 +179,7 @@@ void html_url_arg(const char *txt
  {
        const char *t = txt;
        while(t && *t){
-               int c = *t;
+               unsigned char c = *t;
                const char *e = url_escape_table[c];
                if (c == ' ')
                        e = "+";
@@@ -215,14 -215,6 +215,14 @@@ void html_option(const char *value, con
        html("</option>\n");
  }
  
 +void html_intoption(int value, const char *text, int selected_value)
 +{
 +      htmlf("<option value='%d'%s>", value,
 +            value == selected_value ? " selected='selected'" : "");
 +      html_txt(text);
 +      html("</option>");
 +}
 +
  void html_link_open(const char *url, const char *title, const char *class)
  {
        html("<a href='");