tor-commits August 2013

tor-commits@lists.torproject.org

19 participants
1224 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit bacc2746b9eaa21bc1139e805d2be7671cb6d722 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 18:46:44 2013 +0000 Update translations for tails-misc --- ru.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ru.po b/ru.po index 582acbb..a234626 100644 --- a/ru.po +++ b/ru.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-30 19:08+0200\n" -"PO-Revision-Date: 2013-08-01 10:40+0000\n" +"PO-Revision-Date: 2013-08-02 18:40+0000\n" "Last-Translator: Арефьев Денис <jujjer(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -93,7 +93,7 @@ msgstr "Имя" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "ID ключ" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -101,7 +101,7 @@ msgstr "Статус" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "Отпечаток:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" @@ -112,15 +112,15 @@ msgstr[2] "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "Ничего (не подписывать)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Выбать получателей:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Скрыть получателей" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" @@ -258,7 +258,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Не удалось синхронизировать часы!" #: config/chroot_local-includes/usr/local/bin/tails-security-check:86 #, perl-format @@ -283,18 +283,18 @@ msgstr "Запуск I2P..." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 msgid "The I2P router console will be opened on start." -msgstr "" +msgstr "I2P консоль роутера будет открыта для работы." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 msgid "I2P failed to start" -msgstr "" +msgstr "I2P не удалось запустить" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 msgid "" "Make sure that you have a working Internet connection, then try to start I2P" " again." -msgstr "" +msgstr "Убедитесь, что у вас есть соединение с Интернетом, затем попробуйте запустить I2P снова." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 msgid "" @@ -348,11 +348,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "_Launch" -msgstr "" +msgstr "_Launch" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 msgid "_Exit" -msgstr "" +msgstr "_Exit" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 msgid "Starting the Unsafe Browser..." @@ -364,7 +364,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 msgid "Failed to setup chroot." -msgstr "" +msgstr "Не удалось установить chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 @@ -373,7 +373,7 @@ msgstr "Небезопасный Браузер" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Выключение небезопасного браузера..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 msgid "" @@ -417,7 +417,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " -msgstr "" +msgstr "Анонимная оверлей сеть" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 msgid "i2p" @@ -425,11 +425,11 @@ msgstr "i2p" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 msgid "Anonymous overlay network" -msgstr "" +msgstr "Анонимная оверлей сеть" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" -msgstr "" +msgstr "Перезагрузка" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 msgid "Immediately reboot computer" @@ -437,15 +437,15 @@ msgstr "немедленно перезагрузить компьютер" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" -msgstr "" +msgstr "Выключение" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" -msgstr "" +msgstr "Немедленно выключить компьютер" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" -msgstr "" +msgstr "Обзор Всемирной Паутины без анонимности" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser" @@ -453,4 +453,4 @@ msgstr "Небезопасный Веб Браузер" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" -msgstr "" +msgstr "Tails конкретные инструменты"

1 0

[tor/master] Unit test for smartlist_ints_eq
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 9ac0a681ced764b34ee1d926f077f3dd988a8562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 13:44:22 2013 -0400 Unit test for smartlist_ints_eq (This was the only wholly untested function in containers.c) --- src/test/test_containers.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 005e102..6858fa4 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -469,6 +469,51 @@ test_container_smartlist_join(void) tor_free(joined); } +static void +test_container_smartlist_ints_eq(void *arg) +{ + smartlist_t *sl1 = NULL, *sl2 = NULL; + int x; + (void)arg; + + tt_assert(smartlist_ints_eq(NULL, NULL)); + + sl1 = smartlist_new(); + tt_assert(!smartlist_ints_eq(sl1, NULL)); + tt_assert(!smartlist_ints_eq(NULL, sl1)); + + sl2 = smartlist_new(); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + x = 5; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + x = 90; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + x = -50; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + tt_assert(! smartlist_ints_eq(sl1, sl2)); + tt_assert(! smartlist_ints_eq(sl2, sl1)); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + *(int*)smartlist_get(sl1, 1) = 101010; + tt_assert(! smartlist_ints_eq(sl2, sl1)); + *(int*)smartlist_get(sl2, 1) = 101010; + tt_assert(smartlist_ints_eq(sl1, sl2)); + + done: + if (sl1) + SMARTLIST_FOREACH(sl1, int *, ip, tor_free(ip)); + if (sl2) + SMARTLIST_FOREACH(sl2, int *, ip, tor_free(ip)); + smartlist_free(sl1); + smartlist_free(sl2); +} + /** Run unit tests for bitarray code */ static void test_container_bitarray(void) @@ -784,7 +829,7 @@ test_container_order_functions(void) } static void -test_di_map(void *arg) +test_container_di_map(void *arg) { di_digest256_map_t *map = NULL; const uint8_t key1[] = "In view of the fact that it was "; @@ -912,18 +957,22 @@ test_container_fp_pair_map(void) #define CONTAINER_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_container_ ## name } +#define CONTAINER(name, flags) \ + { #name, test_container_ ## name, (flags), NULL, NULL } + struct testcase_t container_tests[] = { CONTAINER_LEGACY(smartlist_basic), CONTAINER_LEGACY(smartlist_strings), CONTAINER_LEGACY(smartlist_overlap), CONTAINER_LEGACY(smartlist_digests), CONTAINER_LEGACY(smartlist_join), + CONTAINER(smartlist_ints_eq, 0), CONTAINER_LEGACY(bitarray), CONTAINER_LEGACY(digestset), CONTAINER_LEGACY(strmap), CONTAINER_LEGACY(pqueue), CONTAINER_LEGACY(order_functions), - { "di_map", test_di_map, 0, NULL, NULL }, + CONTAINER(di_map, 0), CONTAINER_LEGACY(fp_pair_map), END_OF_TESTCASES };

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 97e697acd888b19f145ffea5f9e3abebd27717c4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 15:16:20 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 206 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 111 insertions(+), 95 deletions(-) diff --git a/es/es.po b/es/es.po index 461e981..5df52af 100644 --- a/es/es.po +++ b/es/es.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-04-29 09:00+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2013-08-01 15:27+0200\n" +"PO-Revision-Date: 2013-08-02 15:00+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,12 +26,12 @@ msgstr "" msgid "%(distribution)s LiveUSB Creator" msgstr "Creador de USB autoarrancable de %(distribution)s" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:776 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s seleccionado(s)" -#: ../liveusb/creator.py:1018 +#: ../liveusb/creator.py:1004 #, python-format msgid "%s already bootable" msgstr "%s ya es arrancable" @@ -88,16 +88,16 @@ msgid "" "persist after a reboot." msgstr "Con la asignación de espacio extra para un área persistente en su memoria USB, será capaz de almacenar datos y hacer modificaciones persistentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que persistan después de un reinicio." -#: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 +#: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculando el checksum SHA1 de %s " -#: ../liveusb/creator.py:1331 +#: ../liveusb/creator.py:1317 msgid "Cannot find" msgstr "No se pudo encontrar" -#: ../liveusb/creator.py:574 +#: ../liveusb/creator.py:545 #, python-format msgid "Cannot find device %s" msgstr "No se pudo encontrar el dispositivo %s" @@ -120,74 +120,73 @@ msgstr "Clonar\n&&\nactualizar" msgid "Create Live USB" msgstr "Crear USB autoarrancable" -#: ../liveusb/creator.py:429 +#: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Creando sistema de archivos persistente de %s MB" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -" Setting a maximum limit of 8G for the persistent storage." -msgstr "El dispositivo no está montado aún, por lo que no se puede determinar el espacio libre. Se establece un límite máximo de 8G para el almacenamiento persistente." - -#: ../liveusb/gui.py:197 -#, python-format -msgid "Device is too small: it must be at least %s MiB." -msgstr "El dispositivo es demasiado pequeño: debe ser al menos de %s MiB." +msgstr "El dispositivo no está montado aún, por lo que no se pudo determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" msgstr "Descargar %(distribution)s" -#: ../liveusb/gui.py:732 +#: ../liveusb/gui.py:750 msgid "Download complete!" msgstr "¡Descarga completa!" -#: ../liveusb/gui.py:736 +#: ../liveusb/gui.py:754 msgid "Download failed: " msgstr "Fallo de la descarga: " -#: ../liveusb/gui.py:84 +#: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." msgstr "Descargando %s..." -#: ../liveusb/creator.py:1116 +#: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..." -#: ../liveusb/creator.py:1196 +#: ../liveusb/creator.py:808 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Ejecutando unmount_device para '%(device)s'" + +#: ../liveusb/creator.py:1182 msgid "Error probing device" msgstr "Error probando el dispositivo " -#: ../liveusb/gui.py:226 +#: ../liveusb/gui.py:227 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Error: No se pudo establecer u obtener el UUID de su dispositivo. No se pudo continuar." -#: ../liveusb/creator.py:405 +#: ../liveusb/creator.py:376 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Error: El checksum SHA1 de su CD autoarrancable (Live CD) no es válido. Puede ejecutar este programa con el modificador --noverify para evitar este chequeo de verificación." -#: ../liveusb/creator.py:144 +#: ../liveusb/creator.py:145 msgid "Extracting live image to USB device..." msgstr "Extrayendo la imagen autoarrancable (live image) del dispositivo USB..." -#: ../liveusb/creator.py:1061 +#: ../liveusb/creator.py:1047 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formateando %(device)s como FAT32" -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" msgstr "El checksum MD5 de la ISO es correcto" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" msgstr "Error en la verificación del checksum MD5 de la ISO" @@ -197,65 +196,77 @@ msgid "" "downloaded for you." msgstr "Si no selecciona una imagen ISO autoarrancable existente, la versión seleccionada se descargará para usted." -#: ../liveusb/gui.py:601 +#: ../liveusb/gui.py:619 msgid "Installation complete!" msgstr "¡Instalación completa!" -#: ../liveusb/gui.py:276 +#: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" msgstr "¡Instalación completa! (%s)" -#: ../liveusb/gui.py:602 +#: ../liveusb/gui.py:620 msgid "Installation was completed. Press OK to close this program." msgstr "Instalación completa. Pulse Aceptar para cerrar este programa." -#: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." msgstr "Instalando gestor de arranque (bootloader)... " -#: ../liveusb/gui.py:281 +#: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" msgstr "¡La creación del USB de arranque (LiveUSB) falló!" -#: ../liveusb/creator.py:1332 +#: ../liveusb/creator.py:1318 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Asegúrese de extraer el archivo zip liveusb-creator completamente antes de ejecutar este programa." -#: ../liveusb/creator.py:1208 +#: ../liveusb/creator.py:1194 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Asegúrese de que su memoria USB está conectada, y formateada con el sistema de archivos FAT" -#: ../liveusb/creator.py:847 +#: ../liveusb/creator.py:830 #, python-format msgid "Mount %s exists after unmounting" msgstr "El punto de montaje %s sigue existiendo tras desmontar " -#: ../liveusb/gui.py:663 ../liveusb/gui.py:680 +#: ../liveusb/gui.py:681 ../liveusb/gui.py:698 msgid "Next" msgstr "Siguiente" -#: ../liveusb/gui.py:541 +#: ../liveusb/gui.py:562 #, python-format msgid "No free space on device %(device)s" msgstr "No hay espacio libre en el dispositivo %(device)s" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:797 msgid "No mount points found" msgstr "No se encontraron puntos de montaje" -#: ../liveusb/creator.py:422 -msgid "Not enough free space on device." -msgstr "No hay suficiente espacio libre en el dispositivo." +#: ../liveusb/creator.py:393 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB partición de datos persistentes (overlay) > %dMB espacio libre" -#: ../liveusb/gui.py:546 +#: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos a 2G" -#: ../liveusb/gui.py:592 +#: ../liveusb/gui.py:539 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "La partición es FAT32; restringiendo el tamaño de la partición de datos persistentes (overlay) a 4G" + +#: ../liveusb/creator.py:226 ../liveusb/creator.py:837 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Particionando el dispositivo %(device)s" + +#: ../liveusb/gui.py:610 msgid "Persistent Storage" msgstr "Almacenamiento persistente" @@ -263,53 +274,53 @@ msgstr "Almacenamiento persistente" msgid "Persistent Storage (0 MB)" msgstr "Almacenamiento persistente (0 MB)" -#: ../liveusb/gui.py:661 ../liveusb/gui.py:678 +#: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." msgstr "Pulse 'Siguiente' si quiere continuar." -#: ../liveusb/gui.py:452 +#: ../liveusb/gui.py:456 msgid "Refreshing releases..." msgstr "Comprobando nuevas versiones..." -#: ../liveusb/gui.py:457 +#: ../liveusb/gui.py:461 msgid "Releases updated!" msgstr "¡Nuevas versiones comprobadas!" -#: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 +#: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 #, python-format msgid "Removing %(file)s" msgstr "Eliminando %(file)s" -#: ../liveusb/creator.py:498 +#: ../liveusb/creator.py:469 msgid "Removing existing Live OS" msgstr "Eliminando el sistema operativo autoarrancable (Live OS) existente" -#: ../liveusb/creator.py:1110 +#: ../liveusb/creator.py:1096 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Restableciendo Master Boot Record de %s" -#: ../liveusb/gui.py:743 +#: ../liveusb/gui.py:761 msgid "Select Live ISO" msgstr "Seleccione una ISO autoarrancable (Live ISO)" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." msgstr "Configurando un archivo de arranque OLPC (One Laptop Per Child)..." -#: ../liveusb/creator.py:738 +#: ../liveusb/creator.py:711 #, python-format msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." msgstr "Algunas particiones del dispositivo USB %(device)s están montadas. Serán desmontadas antes de comenzar el proceso de instalación." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "La fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." -#: ../liveusb/creator.py:1144 +#: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." msgstr "Sincronizando datos en el disco... " @@ -317,19 +328,19 @@ msgstr "Sincronizando datos en el disco... " msgid "Target Device" msgstr "Dispositivo destino" -#: ../liveusb/gui.py:625 +#: ../liveusb/gui.py:643 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." msgstr "El Master Boot Record (registro de arranque maestro) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." -#: ../liveusb/gui.py:746 +#: ../liveusb/gui.py:764 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "El archivo seleccionado no se pudo leer. Ajuste sus permisos o seleccione otro archivo." -#: ../liveusb/creator.py:366 +#: ../liveusb/creator.py:337 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -367,109 +378,114 @@ msgstr "Esta es la barra de progreso que indicará en qué punto, a largo del pr msgid "This is the status console, where all messages get written to." msgstr "Esta es la consola de estado, donde salen escritos todos los mensajes." -#: ../liveusb/creator.py:908 +#: ../liveusb/creator.py:895 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s" -#: ../liveusb/creator.py:507 ../liveusb/creator.py:518 +#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "No se pudo completar chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:488 +#: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "No se pudo copiar %(infile)s en %(outfile)s: %(message)s" -#: ../liveusb/gui.py:414 +#: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" msgstr "No fue posible encontrar alguna unidad USB" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" msgstr "No se pudo encontrar dispositivo extraíble alguno" -#: ../liveusb/creator.py:1038 +#: ../liveusb/creator.py:1024 msgid "Unable to find partition" msgstr "No se pudo encontrar la partición" -#: ../liveusb/creator.py:1278 +#: ../liveusb/creator.py:1264 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "No fue posible obtener Win32_LogicalDisk; la petición win32com no devolvió resultados" -#: ../liveusb/gui.py:653 +#: ../liveusb/gui.py:671 msgid "Unable to mount device" msgstr "No se pudo montar el dispositivo" -#: ../liveusb/creator.py:812 +#: ../liveusb/creator.py:785 #, python-format msgid "Unable to mount device: %(message)s" msgstr "No se pudo montar el dispositivo: %(message)s" -#: ../liveusb/creator.py:523 +#: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarracable (LiveOS): %(message)s" -#: ../liveusb/creator.py:511 +#: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "No se pudo eliminar el archivo del anterior sistema operativo autoarrancable (LiveOS): %(message)s" -#: ../liveusb/creator.py:1113 +#: ../liveusb/creator.py:1099 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `syslinux`" -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:770 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\\)" -#: ../liveusb/creator.py:719 +#: ../liveusb/creator.py:692 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "No se pudo escribir en %(device)s, omitiendo... " -#: ../liveusb/creator.py:411 +#: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" msgstr "ISO desconocida, omitiendo la verificación del checksum" -#: ../liveusb/creator.py:808 +#: ../liveusb/creator.py:781 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Excepción dbus desconocida al intentar montar el dispositivo: %(message)s" -#: ../liveusb/creator.py:787 ../liveusb/creator.py:887 +#: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser formateado." -#: ../liveusb/gui.py:80 +#: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" msgstr "Versión desconocida: %s" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:822 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Desmontando '%(udi)s' en '%(device)s'" + +#: ../liveusb/creator.py:818 #, python-format -msgid "Unmounting %(device)s" -msgstr "Desmontando %(device)s" +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Desmontando los sistemas de ficheros montados en '%(device)s'" -#: ../liveusb/creator.py:792 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format msgid "Unsupported filesystem: %s" msgstr "Sistema de archivos no soportado: %s" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:763 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Sistema de archivos no soportado: %s\nEn caso de que esté intentando actualizar un sistema Tails instalado manualmente (esto es, si fue instalado sin este instalador), esta opción no está soportada: necesita instalarlo de nuevo para comenzar con ello, ej.: escogiendo la acción \"Clonar & Instalar\" en su lugar." -#: ../liveusb/creator.py:1211 +#: ../liveusb/creator.py:1197 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -484,65 +500,65 @@ msgstr "Actualizar desde ISO" msgid "Use existing Live system ISO" msgstr "Usar una ISO de sistema autoarrancable existente" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" msgstr "Verificando el checksum MD5 de la ISO" -#: ../liveusb/creator.py:385 +#: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verificando el checksum SHA1 de la imagen del CD autoarrancable (LiveCD)... " -#: ../liveusb/creator.py:389 +#: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verificando el checksum SHA256 de la imagen del CD autoarrancable (LiveCD)... " -#: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 +#: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..." msgstr "Verificando el sistema de archivos... " -#: ../liveusb/gui.py:659 +#: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost." msgstr "Advertencia: Se perderán todos los datos de la unidad seleccionada." -#: ../liveusb/gui.py:676 +#: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el suyo existente." -#: ../liveusb/gui.py:639 +#: ../liveusb/gui.py:657 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Advertencia: El Master Boot Record (registro de arranque maestro) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe a ejecutar el liveusb-creator con la opción --reset-mbr" -#: ../liveusb/gui.py:389 +#: ../liveusb/gui.py:392 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto, haga clic con el botón secundario del ratón sobre el icono, y abra las Propiedades. Bajo la pestaña Compatibilidad, marque la casilla \"Ejecutar este programa como un administrador\"." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Escrito al dispositivo a %(speed)d MB/sec" -#: ../liveusb/creator.py:636 +#: ../liveusb/creator.py:607 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Está usando una versión antigua de syslinux-extlinux que no soporta el sistema de archivos ext4." -#: ../liveusb/gui.py:737 +#: ../liveusb/gui.py:755 msgid "You can try again to resume your download" msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:92 msgid "You must run this application as root" msgstr "Debe ejecutar esta aplicación como root (superusuario)" -#: ../liveusb/gui.py:673 +#: ../liveusb/gui.py:691 msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 484f389b04df3016d118c4467c1667437b76cb5b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 15:16:17 2013 +0000 Update translations for liveusb-creator --- es/es.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/es/es.po b/es/es.po index 3d181ed..5df52af 100644 --- a/es/es.po +++ b/es/es.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 14:41+0000\n" +"PO-Revision-Date: 2013-08-02 15:00+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "El dispositivo no está montado aún, por lo que no podemos determinar la cantidad de espacio libre." +msgstr "El dispositivo no está montado aún, por lo que no se pudo determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format @@ -155,7 +155,7 @@ msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restable #: ../liveusb/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Ejecutando unmount_device para '%(device)s'" #: ../liveusb/creator.py:1182 msgid "Error probing device" @@ -251,7 +251,7 @@ msgstr "No se encontraron puntos de montaje" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB overlay (espacio extra de almacenamiento persistente) > %dMB espacio libre" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB partición de datos persistentes (overlay) > %dMB espacio libre" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -259,12 +259,12 @@ msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "La partición es FAT32; restringiendo el tamaño de la partición de datos persistentes (overlay) a 4G" #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Particionando el dispositivo %(device)s" #: ../liveusb/gui.py:610 msgid "Persistent Storage" @@ -466,12 +466,12 @@ msgstr "Versión desconocida: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Desmontando '%(udi)s' en '%(device)s'" #: ../liveusb/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Desmontando los sistemas de ficheros montados en '%(device)s'" #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format

1 0

[tor/master] Try to make the win32 ersatz_socketpair pass.
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 362f60e2d4dddb09c3b456732ac272b0e55374f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 11:04:30 2013 -0400 Try to make the win32 ersatz_socketpair pass. --- src/test/test_util.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 213751e..05d28d7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3426,11 +3426,7 @@ test_util_socketpair(void *arg) ersatz ? tor_ersatz_socketpair : tor_socketpair; int n = get_n_open_sockets(); tor_socket_t fds[2] = {TOR_INVALID_SOCKET, TOR_INVALID_SOCKET}; -#ifdef _WIN32 - const int family = AF_INET; -#else const int family = AF_UNIX; -#endif tt_int_op(0, ==, tor_socketpair_fn(family, SOCK_STREAM, 0, fds)); tt_assert(SOCKET_OK(fds[0]));

1 0

[tor/master] Fixed "unused parameter cloexec" warnings on windows
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 48a4ef3f6ab88c48ac391989f2ee38de9dd4dbdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:52:57 2013 -0400 Fixed "unused parameter cloexec" warnings on windows --- src/common/compat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/compat.c b/src/common/compat.c index d69e3b0..3768933 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1092,6 +1092,8 @@ tor_open_socket_with_extensions(int domain, int type, int protocol, return TOR_INVALID_SOCKET; } } +#else + (void)cloexec; #endif if (nonblock) { @@ -1162,6 +1164,8 @@ tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, return TOR_INVALID_SOCKET; } } +#else + (void)cloexec; #endif if (nonblock) {

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 1cf90c92b62ad5fbb9421a2c44dc26530a8e0f20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 14:46:14 2013 +0000 Update translations for liveusb-creator --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 358365c..3d181ed 100644 --- a/es/es.po +++ b/es/es.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 09:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-02 14:41+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -128,7 +128,7 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "El dispositivo no está montado aún, por lo que no podemos determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format @@ -251,7 +251,7 @@ msgstr "No se encontraron puntos de montaje" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB overlay (espacio extra de almacenamiento persistente) > %dMB espacio libre" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[tor/master] Simple unit test for tor_open_socket_with_extensions
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit b8d9c8403718b2dca577947d2f5d9248ab87961e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:05:17 2013 -0400 Simple unit test for tor_open_socket_with_extensions --- src/test/test_util.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index f7513c0..f6b5aa4 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3319,6 +3319,85 @@ test_util_strclear(void *arg) #define UTIL_TEST(name, flags) \ { #name, test_util_ ## name, flags, NULL, NULL } +#ifdef FD_CLOEXEC +#define CAN_CHECK_CLOEXEC +static int +fd_is_cloexec(tor_socket_t fd) +{ + int flags = fcntl(fd, F_GETFD, 0); + return (flags & FD_CLOEXEC) == FD_CLOEXEC; +} +#endif + +#ifndef _WIN32 +#define CAN_CHECK_NONBLOCK +static int +fd_is_nonblocking(tor_socket_t fd) +{ + int flags = fcntl(fd, F_GETFL, 0); + return (flags & O_NONBLOCK) == O_NONBLOCK; +} +#endif + +static void +test_util_socket(void *arg) +{ + tor_socket_t fd1 = TOR_INVALID_SOCKET; + tor_socket_t fd2 = TOR_INVALID_SOCKET; + tor_socket_t fd3 = TOR_INVALID_SOCKET; + tor_socket_t fd4 = TOR_INVALID_SOCKET; + int n = get_n_open_sockets(); + + TT_BLATHER(("Starting with %d open sockets.", n)); + + (void)arg; + + fd1 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 0, 0); + fd2 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 0, 1); + tt_assert(SOCKET_OK(fd1)); + tt_assert(SOCKET_OK(fd2)); + tt_int_op(get_n_open_sockets(), ==, n + 2); + //fd3 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 1, 0); + //fd4 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 1, 1); + fd3 = tor_open_socket(AF_INET, SOCK_STREAM, 0); + fd4 = tor_open_socket_nonblocking(AF_INET, SOCK_STREAM, 0); + tt_assert(SOCKET_OK(fd3)); + tt_assert(SOCKET_OK(fd4)); + tt_int_op(get_n_open_sockets(), ==, n + 4); + +#ifdef CAN_CHECK_CLOEXEC + tt_int_op(fd_is_cloexec(fd1), ==, 0); + tt_int_op(fd_is_cloexec(fd2), ==, 0); + tt_int_op(fd_is_cloexec(fd3), ==, 1); + tt_int_op(fd_is_cloexec(fd4), ==, 1); +#endif +#ifdef CAN_CHECK_NONBLOCK + tt_int_op(fd_is_nonblocking(fd1), ==, 0); + tt_int_op(fd_is_nonblocking(fd2), ==, 1); + tt_int_op(fd_is_nonblocking(fd3), ==, 0); + tt_int_op(fd_is_nonblocking(fd4), ==, 1); +#endif + + tor_close_socket(fd1); + tor_close_socket(fd2); + fd1 = fd2 = TOR_INVALID_SOCKET; + tt_int_op(get_n_open_sockets(), ==, n + 2); + tor_close_socket(fd3); + tor_close_socket(fd4); + fd3 = fd4 = TOR_INVALID_SOCKET; + tt_int_op(get_n_open_sockets(), ==, n); + + done: + if (SOCKET_OK(fd1)) + tor_close_socket(fd1); + if (SOCKET_OK(fd2)) + tor_close_socket(fd2); + if (SOCKET_OK(fd3)) + tor_close_socket(fd3); + if (SOCKET_OK(fd4)) + tor_close_socket(fd4); +} + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -3375,6 +3454,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(read_file_eof_zero_bytes, 0), UTIL_TEST(mathlog, 0), UTIL_TEST(weak_random, 0), + UTIL_TEST(socket, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Unit test for tor_{ersatz_, }socketpair.
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit bcc39c466688e41ac8f58e5589e854a916769a14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:36:36 2013 -0400 Unit test for tor_{ersatz_,}socketpair. This catches tor_accept as well. --- src/test/test_util.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index f6b5aa4..213751e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4,6 +4,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" +#define COMPAT_PRIVATE #define CONTROL_PRIVATE #define MEMPOOL_PRIVATE #define UTIL_PRIVATE @@ -3398,6 +3399,59 @@ test_util_socket(void *arg) tor_close_socket(fd4); } +static void * +socketpair_test_setup(const struct testcase_t *testcase) +{ + return testcase->setup_data; +} +static int +socketpair_test_cleanup(const struct testcase_t *testcase, void *ptr) +{ + (void)testcase; + (void)ptr; + return 1; +} + +static const struct testcase_setup_t socketpair_setup = { + socketpair_test_setup, socketpair_test_cleanup +}; + +/* Test for socketpair and ersatz_socketpair(). We test them both, since + * the latter is a tolerably good way to exersize tor_accept_socket(). */ +static void +test_util_socketpair(void *arg) +{ + const int ersatz = !strcmp(arg, "1"); + int (*const tor_socketpair_fn)(int, int, int, tor_socket_t[2]) = + ersatz ? tor_ersatz_socketpair : tor_socketpair; + int n = get_n_open_sockets(); + tor_socket_t fds[2] = {TOR_INVALID_SOCKET, TOR_INVALID_SOCKET}; +#ifdef _WIN32 + const int family = AF_INET; +#else + const int family = AF_UNIX; +#endif + + tt_int_op(0, ==, tor_socketpair_fn(family, SOCK_STREAM, 0, fds)); + tt_assert(SOCKET_OK(fds[0])); + tt_assert(SOCKET_OK(fds[1])); + tt_int_op(get_n_open_sockets(), ==, n + 2); +#ifdef CAN_CHECK_CLOEXEC + tt_int_op(fd_is_cloexec(fds[0]), ==, 1); + tt_int_op(fd_is_cloexec(fds[1]), ==, 1); +#endif +#ifdef CAN_CHECK_NONBLOCK + tt_int_op(fd_is_nonblocking(fds[0]), ==, 0); + tt_int_op(fd_is_nonblocking(fds[1]), ==, 0); +#endif + + done: + if (SOCKET_OK(fds[0])) + tor_close_socket(fds[0]); + if (SOCKET_OK(fds[1])) + tor_close_socket(fds[1]); +} + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -3455,6 +3509,10 @@ struct testcase_t util_tests[] = { UTIL_TEST(mathlog, 0), UTIL_TEST(weak_random, 0), UTIL_TEST(socket, TT_FORK), + { "socketpair", test_util_socketpair, TT_FORK, &socketpair_setup, + (void*)"0" }, + { "socketpair_ersatz", test_util_socketpair, TT_FORK, + &socketpair_setup, (void*)"1" }, END_OF_TESTCASES };

1 0

[tor/master] Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit e25eb35f11b0419fe50791b3760f1d4016bf8a8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:04:21 2013 -0400 Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case --- src/common/compat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index af8f288..8aab12a 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1084,10 +1084,12 @@ tor_open_socket_with_extensions(int domain, int type, int protocol, return s; #if defined(FD_CLOEXEC) - if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { - log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); - tor_close_socket_simple(s); - return TOR_INVALID_SOCKET; + if (cloexec) { + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } } #endif

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2013