From 9c7647b3b02fc20325e89f437006fca8945c804f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Dec 2016 17:26:43 +0100 Subject: Dead code Change-Id: I70078bf77786772795bc569407a9e6ac372df758 --- shell/source/unix/exec/shellexec.cxx | 21 ++--- shell/source/unix/exec/shellexec.hxx | 5 -- shell/source/unix/exec/urltest.cxx | 144 ----------------------------------- shell/source/unix/exec/urltest.sh | 2 - shell/source/unix/exec/urltest.txt | 11 --- 5 files changed, 11 insertions(+), 172 deletions(-) delete mode 100644 shell/source/unix/exec/urltest.cxx delete mode 100755 shell/source/unix/exec/urltest.sh delete mode 100644 shell/source/unix/exec/urltest.txt (limited to 'shell') diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 71f01e764a56..002e3a55570d 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -57,19 +58,19 @@ namespace Sequence< OUString > aRet { "com.sun.star.system.SystemShellExecute" }; return aRet; } -} -void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) -{ - sal_Int32 nmax = rURL.getLength(); - for(sal_Int32 n=0; n < nmax; ++n) + void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) { - // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\' - sal_Char c = rURL[n]; - if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' ) - rBuffer.append( '\\' ); + sal_Int32 nmax = rURL.getLength(); + for(sal_Int32 n=0; n < nmax; ++n) + { + // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\' + sal_Char c = rURL[n]; + if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' ) + rBuffer.append( '\\' ); - rBuffer.append( c ); + rBuffer.append( c ); + } } } diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx index bfcae183f063..85f3d17c91b6 100644 --- a/shell/source/unix/exec/shellexec.hxx +++ b/shell/source/unix/exec/shellexec.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -61,10 +60,6 @@ public: throw(css::uno::RuntimeException, std::exception) override; }; - -// helper function - needed for urltest -void escapeForShell( OStringBuffer & rBuffer, const OString & rURL); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx deleted file mode 100644 index c1a624fa1f66..000000000000 --- a/shell/source/unix/exec/urltest.cxx +++ /dev/null @@ -1,144 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "shellexec.hxx" - -#include - -#include -#include -#include -#include - - -int main(int argc, const char *argv[]) -{ - int ret = 0; - - if( argc != 2 ) - { - fprintf(stderr, "Usage: urltest \n"); - return -1; - } - - FILE * fp = fopen( argv[1], "r" ); - if( NULL == fp ) - { - perror( argv[1] ); - return -1; - } - - // expect urltest.sh beside this binary - char line[LINE_MAX]; - size_t len = strlen(argv[0]); - strcpy( line, argv[0] ); - strcpy( line + len, ".sh " ); - len += 4; - - unsigned int errors = 0; - - // read url(s) to test from file - char url[512]; - while( NULL != fgets(url, sizeof(url), fp)) - { - // remove trailing line break - strtok( url, "\r\n" ); - - printf( "Passing URL: %s\n", url ); - - // test the encoding functionality from shellexec.cxx - OString aURL( url ); - OStringBuffer aBuffer; - escapeForShell(aBuffer, aURL); - - // append encoded URL as (only) parameter to the script - strcpy( line + len, aBuffer.getStr() ); - - printf( "Command line: %s\n", line ); - - FILE * pipe = popen( line, "r" ); - if( NULL != pipe ) - { - char buffer[BUFSIZ]; - - // initialize buffer with '\0' - memset(buffer, '\0', BUFSIZ); - - // read the output of the script - if(NULL == fgets( buffer, BUFSIZ, pipe)) - { - perror("FAILED: output of script could not be read"); - printf( "\n"); - ++errors; - continue; - } - - // remove trailing line break again - strtok( buffer, "\r\n" ); - - int n = pclose(pipe); - if( 0 != n ) - { - printf("FAILED: fclose returned %d\n\n", n ); - ++errors; - continue; - } - - if( 0 == strcmp( url, buffer ) ) - { - // strings are identical: good ! - printf( "OK\n\n"); - } - else - { - // compare failed - printf( "FAILED: returned string is %s\n\n", buffer); - ++errors; - } - - } - else - { - perror( line ); - ret = -2; - break; - } - } - - if( ferror( fp ) ) - { - perror( argv[1] ); - ret = -1; - } - - fclose( fp ); - - if( errors ) - { - printf( "Number of tests failing: %u\n", errors); - ret = -3; - } - else - printf( "All tests passed OK.\n" ); - - - return ret; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/unix/exec/urltest.sh b/shell/source/unix/exec/urltest.sh deleted file mode 100755 index ce55ee694114..000000000000 --- a/shell/source/unix/exec/urltest.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "$1" \ No newline at end of file diff --git a/shell/source/unix/exec/urltest.txt b/shell/source/unix/exec/urltest.txt deleted file mode 100644 index e69a8cfaf92b..000000000000 --- a/shell/source/unix/exec/urltest.txt +++ /dev/null @@ -1,11 +0,0 @@ -http://www.openoffice.org -http://en.wiktionary.org/wiki/harmless';CMD=lsx-lx$HOME;IFS=x;$CMD;#' -http://en.wikipedia.org/wiki/Shell_(computers) -http://www.google.com/search?hl=$100+bill -http://unix.t-a-y-l-o-r.com/;clear;ls -http://www.google.com/;exec mozilla; -http://www.yahoo.com/<> -http://www.yahoo.com/\ -http://www.yahoo.com/" -http://www.yahoo.com/' -http://www.yahoo.com/;echo 'this'; \ No newline at end of file -- cgit