src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java

rev 59106 : imported patch client

@@ -149,14 +149,10 @@
 
     static boolean isMac() {
         return osname.startsWith("Mac");
     }
 
-    static boolean isSysV() {
-        return osname.equals("SunOS");
-    }
-
     static boolean isLinux() {
         return (osname.equals("Linux"));
     }
 
     static boolean isBSD() {

@@ -299,11 +295,11 @@
                     int lastIndex = printerURIs[i].lastIndexOf("/");
                     printers[i] = printerURIs[i].substring(lastIndex+1);
                 }
             }
         } else {
-            if (isMac() || isSysV()) {
+            if (isMac()) {
                 printers = getAllPrinterNamesSysV();
             } else if (isAIX()) {
                 printers = getAllPrinterNamesAIX();
             } else { //BSD
                 printers = getAllPrinterNamesBSD();

@@ -483,11 +479,11 @@
                                               e);
             }
         }
         /* fallback if nothing not having a printer at this point */
         PrintService printer = null;
-        if (isMac() || isSysV()) {
+        if (isMac()) {
             printer = getNamedPrinterNameSysV(name);
         } else if (isAIX()) {
             printer = getNamedPrinterNameAIX(name);
         } else {
             printer = getNamedPrinterNameBSD(name);

@@ -651,11 +647,11 @@
             if (printerInfo != null && printerInfo.length >= 2) {
                 defaultPrinter = printerInfo[0];
                 psuri = printerInfo[1];
             }
         } else {
-            if (isMac() || isSysV()) {
+            if (isMac()) {
                 defaultPrinter = getDefaultPrinterNameSysV();
             } else if (isAIX()) {
                 defaultPrinter = getDefaultPrinterNameAIX();
             } else {
                 defaultPrinter = getDefaultPrinterNameBSD();

@@ -870,11 +866,11 @@
 
     static String[] execCmd(final String command) {
         ArrayList<String> results = null;
         try {
             final String[] cmd = new String[3];
-            if (isSysV() || isAIX()) {
+            if (isAIX()) {
                 cmd[0] = "/usr/bin/sh";
                 cmd[1] = "-c";
                 cmd[2] = "env LC_ALL=C " + command;
             } else {
                 cmd[0] = "/bin/sh";