aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-07-07 19:55:27 +0000
committerJason Woodward2005-07-07 19:55:27 +0000
commit669fc932c165e74e8aaf59134dbe637bca537631 (patch)
tree115c9148e134c81959ef593b9650bbd30e3963cd
parent6498b5a0f41fc7b693f7efa909cbbffb1bfef8de (diff)
downloadslapt-get-669fc932c165e74e8aaf59134dbe637bca537631.tar.gz
rollback autoconf build
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL4
-rw-r--r--README42
-rw-r--r--src/action.c2
-rw-r--r--src/configuration.c51
-rw-r--r--src/curl.c2
-rw-r--r--src/package.c2
-rw-r--r--src/transaction.c2
8 files changed, 83 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 22896e5..8f2ecbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,5 @@
-0.9.10 Jul 07, 2005
- * updated build process to use autoconf/automake
- * moved header files into src
+0.9.10 Jul 06, 2005
* updated configuration parser to detect sources with spaces at the end
and updated handling of sources without trailing slashes
* check in update_pkg_cache() to make sure patch_pkgs is initialized
diff --git a/INSTALL b/INSTALL
index aef510f..e5a99b9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,7 @@
-- Source install ---------------------------------------------------
+- Using Make: ---------------------------------------------------
To install:
- $ ./configure --prefix=/usr
$ make
$ make install
@@ -16,7 +15,6 @@
To install:
- $ ./configure --prefix=/usr
$ make pkg
$ installpkg ./pkg/slapt-get-${VERSION}-${ARCH}-${RELEASE}.tgz
diff --git a/README b/README
index ccbadc9..f76d0cf 100644
--- a/README
+++ b/README
@@ -173,4 +173,44 @@ Table of Contents:
Thanks to James Simmons over at linuxpackages.net for his interest, support,
and ideas.
- See AUTHORS for more info.
+ nixon <nixon at klub dot chip dot pl> and simon
+ <ssiimm at poczta dot onet dot pl> authored the Polish translation. With
+ updates by Paul Blazejowski <paulb at blazebox dot homeip dot net>, and
+ Piotr Simon <sajmon at tenboard dot com>.
+
+ Arnaldo de Moraes Pereira <arnaldo at sp-dhn dot com dot br> authored the
+ Brazilian Portuguese translation.
+
+ Michiel H. <myself at mhil dot net> authored the Dutch translation.
+
+ Joran Kvalvaag <jk at nerdworks dot org> authored the Norwegian translation.
+
+ Ruben <ruben at snpp dot com dot ar> authored the Latin American and Spanish
+ translations.
+
+ Francesco Gigli <jaramir at slack dot it> authored the Italian translation.
+
+ Joel Bjurman <ypolt at lediga dot st> authored the Swedish translation.
+
+ Savvas Efstratiadis <pigouinos at mailworks dot org> authored the Greek
+ translation.
+
+ Niklas Volbers <mithrandir42 at web dot de> authored the German translation.
+
+ Oto Petrik <oto.petrik at centrum dot cz > authored the Czech translation.
+
+ Piotr Simon <sajmon at tenboard dot com> created the HTML version of the FAQ.
+
+ Miguel Santinho <info at Simplicidade dot com> authored the Portuguese_Portugal
+ translation.
+
+ Vu Nguyen (vncasper at yahoo dot com) authored the Vietnamese translation.
+
+ publikum at users dot sourceforge dot net authored the Slovenian translation.
+
+ Verachten Bruno <gounthar at gmail dot com> authored the French translation.
+
+ freerock <freerock at gmail dot com> contributed the DESTDIR support for the makefile.
+
+ Erik Gyepes <depi at depi dot sk> contributed the Slovak translation.
+
diff --git a/src/action.c b/src/action.c
index 89cd7be..2317f27 100644
--- a/src/action.c
+++ b/src/action.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "main.h"
+#include <main.h>
static int cmp_pkg_arch(const char *a,const char *b);
diff --git a/src/configuration.c b/src/configuration.c
index 2717000..a1820fc 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -239,34 +239,55 @@ void add_exclude(struct exclude_list *list,const char *e)
void add_source(struct source_list *list,const char *s)
{
char **realloc_tmp;
- unsigned int i;
+ int source_len = 0;
if ( s == NULL )
return;
- realloc_tmp = realloc(list->url,sizeof *list->url * (list->count + 2) );
+ source_len = strlen(s);
+
+ realloc_tmp = realloc(list->url,sizeof *list->url * (list->count + 1) );
if ( realloc_tmp == NULL )
return;
list->url = realloc_tmp;
- /* we make nul + 1 in case we have to add a / */
- list->url[list->count] = slapt_malloc(sizeof *list->url[list->count] * (strlen(s) + 2));
- /* walk the source to make sure no additional garbage is at the end */
- for (i = 0; i < strlen(s); ++i) {
- if (isblank(s[i]) == 0) {
- list->url[list->count][i] = s[i];
+ if ( s[source_len - 1] == '/' ) {
+
+ list->url[ list->count ] = strndup(s,source_len);
+ list->url[ list->count ][source_len] = '\0';
+
+ } else {
+
+ list->url[ list->count ] = slapt_malloc(
+ sizeof *list->url[list->count] * (source_len + 2)
+ );
+ list->url[list->count][0] = '\0';
+
+ list->url[list->count] = strncat(
+ list->url[list->count],
+ s,
+ source_len
+ );
+
+ if (isblank(list->url[list->count][source_len - 1]) == 0) {
+ list->url[list->count] = strncat(
+ list->url[list->count],
+ "/",
+ strlen("/")
+ );
} else {
- list->url[list->count][i] = '\0';
+ if (list->url[list->count][source_len - 2] == '/') {
+ list->url[list->count][source_len - 2] = '/';
+ list->url[list->count][source_len - 1] = '\0';
+ } else {
+ list->url[list->count][source_len - 1] = '/';
+ }
}
- }
- list->url[ list->count ][strlen(s)] = '\0';
- /* add a trailing / if it's not there */
- if (list->url[list->count][strlen(list->url[list->count]) - 1] != '/') {
- list->url[list->count][strlen(list->url[list->count])] = '/';
- list->url[list->count][strlen(list->url[list->count]) + 1] = '\0';
+ list->url[list->count][source_len + 1] = '\0';
+
}
++list->count;
diff --git a/src/curl.c b/src/curl.c
index 6bd410f..e3af93b 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "main.h"
+#include <main.h>
static size_t write_header_callback(void *buffer,
size_t size, size_t nmemb, void *userp);
diff --git a/src/package.c b/src/package.c
index 5e4aff9..2ef6aea 100644
--- a/src/package.c
+++ b/src/package.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "main.h"
+#include <main.h>
/* analyze the pkg version hunk by hunk */
static struct pkg_version_parts *break_down_pkg_version(const char *version);
/* parse the meta lines */
diff --git a/src/transaction.c b/src/transaction.c
index d6abb56..62a93c7 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "main.h"
+#include <main.h>
static queue_t *queue_init(void);
static void queue_add_install(queue_t *t, pkg_info_t *p);