src/solaris/classes/sun/print/UnixPrintServiceLookup.java

*** 112,121 ****
--- 112,125 ----
  
          osname = java.security.AccessController.doPrivileged(
              new sun.security.action.GetPropertyAction("os.name"));
      }
  
+     static boolean isMac() {
+         return osname.startsWith("Mac");
+     }
+ 
      static boolean isSysV() {
          return osname.equals("SunOS");
      }
  
      static boolean isBSD() {
*** 210,220 ****
                      int lastIndex = printerURIs[i].lastIndexOf("/");
                      printers[i] = printerURIs[i].substring(lastIndex+1);
                  }
              }
          } else {
!             if (isSysV()) {
                  printers = getAllPrinterNamesSysV();
              } else { //BSD
                  printers = getAllPrinterNamesBSD();
              }
          }
--- 214,224 ----
                      int lastIndex = printerURIs[i].lastIndexOf("/");
                      printers[i] = printerURIs[i].substring(lastIndex+1);
                  }
              }
          } else {
!             if (isMac() || isSysV()) {
                  printers = getAllPrinterNamesSysV();
              } else { //BSD
                  printers = getAllPrinterNamesBSD();
              }
          }
*** 359,369 ****
          String name = nameAttr.getValue();
          PrintService printer = null;
          if (name == null || name.equals("") || !checkPrinterName(name)) {
              return null;
          }
!         if (isSysV()) {
              printer = getNamedPrinterNameSysV(name);
          } else {
              printer = getNamedPrinterNameBSD(name);
          }
          return printer;
--- 363,373 ----
          String name = nameAttr.getValue();
          PrintService printer = null;
          if (name == null || name.equals("") || !checkPrinterName(name)) {
              return null;
          }
!         if (isMac() || isSysV()) {
              printer = getNamedPrinterNameSysV(name);
          } else {
              printer = getNamedPrinterNameBSD(name);
          }
          return printer;
*** 521,531 ****
          IPPPrintService.debug_println("isRunning ? "+
                                        (CUPSPrinter.isCupsRunning()));
          if (CUPSPrinter.isCupsRunning()) {
              defaultPrinter = CUPSPrinter.getDefaultPrinter();
          } else {
!             if (isSysV()) {
                  defaultPrinter = getDefaultPrinterNameSysV();
              } else {
                  defaultPrinter = getDefaultPrinterNameBSD();
              }
          }
--- 525,535 ----
          IPPPrintService.debug_println("isRunning ? "+
                                        (CUPSPrinter.isCupsRunning()));
          if (CUPSPrinter.isCupsRunning()) {
              defaultPrinter = CUPSPrinter.getDefaultPrinter();
          } else {
!             if (isMac() || isSysV()) {
                  defaultPrinter = getDefaultPrinterNameSysV();
              } else {
                  defaultPrinter = getDefaultPrinterNameBSD();
              }
          }
*** 642,652 ****
            return null;
          }
          return names;
      }
  
!     private String getDefaultPrinterNameSysV() {
          String defaultPrinter = "lp";
          String command = "/usr/bin/lpstat -d";
  
          String [] names = execCmd(command);
          if (names == null || names.length == 0) {
--- 646,656 ----
            return null;
          }
          return names;
      }
  
!     static String getDefaultPrinterNameSysV() {
          String defaultPrinter = "lp";
          String command = "/usr/bin/lpstat -d";
  
          String [] names = execCmd(command);
          if (names == null || names.length == 0) {