emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-repo: sanitize uri provided to the add target also for remote

Browse Source 
repositories.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091027142504-ezcqy2z7fuxz9j1z
This commit is contained in:
Juan RP 2009-10-27 15:25:04 +01:00
parent dc258f4e20
commit 4b99264063
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/xbps-repo/main.c
View File

@ -143,13 +143,18 @@ add_repository(const char *uri, bool remote)
int rv = 0; int rv = 0;
if (remote) { if (remote) {
rv = xbps_sync_repository_pkg_index(uri); if (!sanitize_localpath(idxstr, uri))
return errno;
rv = xbps_sync_repository_pkg_index(idxstr);
if (rv != 0) if (rv != 0)
return rv; return rv;
plist = xbps_get_pkg_index_plist(uri);
plist = xbps_get_pkg_index_plist(idxstr);
} else { } else {
if (!sanitize_localpath(idxstr, uri)) if (!sanitize_localpath(idxstr, uri))
return errno; return errno;
plist = xbps_get_pkg_index_plist(idxstr); plist = xbps_get_pkg_index_plist(idxstr);
} }
@ -176,19 +181,14 @@ add_repository(const char *uri, bool remote)
goto out; goto out;
} }
if (remote) if ((rv = xbps_register_repository(idxstr)) != 0) {
rv = xbps_register_repository(uri);
else
rv = xbps_register_repository(idxstr);
if (rv != 0) {
printf("ERROR: couldn't register repository (%s)\n", printf("ERROR: couldn't register repository (%s)\n",
strerror(rv)); strerror(rv));
goto out; goto out;
} }
printf("Added repository at %s (%s) with %ju packages.\n", printf("Added repository at %s (%s) with %ju packages.\n",
uri, rinfo->index_version, rinfo->total_pkgs); idxstr, rinfo->index_version, rinfo->total_pkgs);
out: out:
if (dict != NULL) if (dict != NULL)